Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix targetting for 9.0.0 packages. #4523

Merged
merged 7 commits into from
Oct 21, 2024
Merged

Fix targetting for 9.0.0 packages. #4523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d9b15a6
Update Util.csproj to use the same TargetFramework assignment logic a…
LoopedBard3 Oct 17, 2024
7a2f37f
Add 9.0.0 feed to fix build failure for now.
LoopedBard3 Oct 17, 2024
16f0d59
Run updates and add windowsdesktop and aspnetcore dependencies.
LoopedBard3 Oct 21, 2024
8db153d
Merge branch 'main' into UpdateUtilCsproj
LoopedBard3 Oct 21, 2024
d9d55ce
Remove NuGet.config because darc does not seem to support updating pa…
LoopedBard3 Oct 21, 2024
6361608
Revert "Remove NuGet.config because darc does not seem to support upd…
LoopedBard3 Oct 21, 2024
3068316
Remove NuGet.config because darc does not seem to support updating pa…
LoopedBard3 Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-pub-dotnet-runtime-197db4f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-197db4ff/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-pub-dotnet-windowsdesktop-5307f2a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-windowsdesktop-5307f2ab/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-pub-dotnet-aspnetcore-ff8e369" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-ff8e3690/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
Expand All @@ -34,5 +40,10 @@
<!-- Added manually for .NET 8 iOS -->
<add key="darc-pub-xamarin-xamarin-macios-a8d7eab" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-xamarin-xamarin-macios-a8d7eab2/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources />
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
</configuration>
7 changes: 7 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>197db4ff0ded5f02e2d050f1310f297265d19e3d</Sha>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>5307f2abc4387e29964c6f46cb1f63cfdc218602</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ff8e3690dee1f9278fec6055a91e936300c35c37</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
1 change: 1 addition & 0 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<GenerateDocumentationFile>False</GenerateDocumentationFile>

<!-- every warning is important, we want to enforce best practices here to keep high quality of the code and avoid common mistakes -->
<NoWarn>$(NoWarn);NU1507</NoWarn> <!-- Darc does not seem to support auto updating of packageSourceMapping causing tool publishes to fail without manual updating of the NuGet.config with package mappings, disable this check so we don't have to manually update the source mappings. -->
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>

Expand Down
20 changes: 0 additions & 20 deletions src/tools/NuGet.config
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/tools/ScenarioMeasurement/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
<PropertyGroup>
<FallbackTargetFramework>net8.0</FallbackTargetFramework>
<LibrariesTargetFramework>net8.0</LibrariesTargetFramework>
<NoWarn>$(NoWarn);CS8002</NoWarn>
<LangVersion>latest</LangVersion>
</PropertyGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/tools/ScenarioMeasurement/Util/Util.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>$(LibrariesTargetFramework)</TargetFramework>
<TargetFramework>$(PERFLAB_TARGET_FRAMEWORKS)</TargetFramework>
<!-- Supported target frameworks -->
<TargetFramework Condition="'$(TargetFramework)' == ''">$(FallbackTargetFramework)</TargetFramework>
<RootNamespace>ScenarioMeasurement</RootNamespace>
</PropertyGroup>

Expand Down
Loading