Skip to content

Commit c78eeb2

Browse files
authored
Fix targetting for 9.0.0 packages. (#4523)
* Update Util.csproj to use the same TargetFramework assignment logic as other projects in ScenarioMeasurement. Also removed the no longer used LibrariesTargetFramework property from the Scenario Measurement Directory.Build.props. * Add 9.0.0 feeds to fix build failures. * Remove src/tools/NuGet.config because darc does not seem to support updating package mappings and disable the warning for not having package mappings.
1 parent fd312b3 commit c78eeb2

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

NuGet.config

+12-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@
99
<!-- Begin: Package sources from dotnet-runtime -->
1010
<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" />
1111
<!-- End: Package sources from dotnet-runtime -->
12+
<!-- Begin: Package sources from dotnet-windowsdesktop -->
13+
<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" />
14+
<!-- End: Package sources from dotnet-windowsdesktop -->
15+
<!-- Begin: Package sources from dotnet-aspnetcore -->
16+
<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" />
17+
<!-- End: Package sources from dotnet-aspnetcore -->
1218
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1319
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
1420
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
@@ -34,5 +40,10 @@
3440
<!-- Added manually for .NET 8 iOS -->
3541
<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" />
3642
</packageSources>
37-
<disabledPackageSources />
43+
<disabledPackageSources>
44+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
45+
<!-- Begin: Package sources from dotnet-windowsdesktop -->
46+
<!-- End: Package sources from dotnet-windowsdesktop -->
47+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
48+
</disabledPackageSources>
3849
</configuration>

eng/Version.Details.xml

+7
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@
1616
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0">
1717
<Uri>https://github.com/dotnet/runtime</Uri>
1818
<Sha>197db4ff0ded5f02e2d050f1310f297265d19e3d</Sha>
19+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0">
20+
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
21+
<Sha>5307f2abc4387e29964c6f46cb1f63cfdc218602</Sha>
22+
</Dependency>
23+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0">
24+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
25+
<Sha>ff8e3690dee1f9278fec6055a91e936300c35c37</Sha>
1926
</Dependency>
2027
</ProductDependencies>
2128
<ToolsetDependencies>

src/Directory.Build.props

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<GenerateDocumentationFile>False</GenerateDocumentationFile>
1414

1515
<!-- every warning is important, we want to enforce best practices here to keep high quality of the code and avoid common mistakes -->
16+
<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. -->
1617
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
1718
<WarningLevel>4</WarningLevel>
1819

src/tools/NuGet.config

-20
This file was deleted.

src/tools/ScenarioMeasurement/Directory.Build.props

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
44
<PropertyGroup>
55
<FallbackTargetFramework>net8.0</FallbackTargetFramework>
6-
<LibrariesTargetFramework>net8.0</LibrariesTargetFramework>
76
<NoWarn>$(NoWarn);CS8002</NoWarn>
87
<LangVersion>latest</LangVersion>
98
</PropertyGroup>

src/tools/ScenarioMeasurement/Util/Util.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Library</OutputType>
4-
<TargetFramework>$(LibrariesTargetFramework)</TargetFramework>
4+
<TargetFramework>$(PERFLAB_TARGET_FRAMEWORKS)</TargetFramework>
5+
<!-- Supported target frameworks -->
6+
<TargetFramework Condition="'$(TargetFramework)' == ''">$(FallbackTargetFramework)</TargetFramework>
57
<RootNamespace>ScenarioMeasurement</RootNamespace>
68
</PropertyGroup>
79

0 commit comments

Comments
 (0)