Skip to content

Commit 677f202

Browse files
authored
Merge branch 'release/8.0.1xx' into darc-release/8.0.1xx-46113ac3-1679-4d32-af35-6df991dc4a89
2 parents d0cd841 + ba0e784 commit 677f202

File tree

5 files changed

+110
-103
lines changed

5 files changed

+110
-103
lines changed

Directory.Build.props

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,8 @@
1414
<SdkTargetFramework>net8.0</SdkTargetFramework>
1515
<ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework>
1616

17-
<!-- VS for Mac may run on a lower version of .NET than the SDK is targeting, but needs to load the resolvers. So the resolvers and dependencies
18-
may target a lower version of .NET -->
19-
<ResolverTargetFramework>net7.0</ResolverTargetFramework>
20-
<!-- Source build does not need to worry about running on VS for Mac -->
21-
<ResolverTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">$(SdkTargetFramework)</ResolverTargetFramework>
17+
<!-- VS for Mac is retired so no need to target a downlevel .NET for its resolver. -->
18+
<ResolverTargetFramework>$(SdkTargetFramework)</ResolverTargetFramework>
2219

2320
<!-- NU1701 Disable implicit package target fallback, and disable warning for when we explicitly add it (currently needed for
2421
Microsoft.ApplicationInsights) -->

NuGet.config

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<clear />
44
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
55
<!-- Begin: Package sources from dotnet-emsdk -->
6+
<add key="darc-pub-dotnet-emsdk-42532a7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-42532a75/nuget/v3/index.json" />
67
<!-- End: Package sources from dotnet-emsdk -->
78
<!-- Begin: Package sources from dotnet-format -->
89
<add key="darc-pub-dotnet-format-a9a546e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-a9a546ec/nuget/v3/index.json" />
@@ -12,18 +13,21 @@
1213
<add key="darc-pub-dotnet-format-a9a546e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-a9a546ec-1/nuget/v3/index.json" />
1314
<!-- End: Package sources from dotnet-format -->
1415
<!-- Begin: Package sources from dotnet-aspnetcore -->
16+
<add key="darc-int-dotnet-aspnetcore-6254f5c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-6254f5ca/nuget/v3/index.json" />
1517
<!-- End: Package sources from dotnet-aspnetcore -->
1618
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
17-
<add key="darc-pub-DotNet-msbuild-Trusted-fda44ee" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-fda44ee8/nuget/v3/index.json" />
19+
<add key="darc-int-DotNet-msbuild-Trusted-f0cbb13" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-f0cbb139/nuget/v3/index.json" />
1820
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1921
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2022
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2123
<!-- Begin: Package sources from dotnet-runtime -->
24+
<add key="darc-int-dotnet-runtime-362ab66" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-362ab666/nuget/v3/index.json" />
2225
<!-- End: Package sources from dotnet-runtime -->
2326
<!-- Begin: Package sources from dotnet-templating -->
2427
<add key="darc-pub-dotnet-templating-f76b42a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f76b42aa/nuget/v3/index.json" />
2528
<!-- End: Package sources from dotnet-templating -->
2629
<!-- Begin: Package sources from dotnet-windowsdesktop -->
30+
<add key="darc-int-dotnet-windowsdesktop-74e82c7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-74e82c7a/nuget/v3/index.json" />
2731
<!-- End: Package sources from dotnet-windowsdesktop -->
2832
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2933
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -48,15 +52,19 @@
4852
<!-- Begin: Package sources from dotnet-templating -->
4953
<!-- End: Package sources from dotnet-templating -->
5054
<!-- Begin: Package sources from dotnet-aspnetcore -->
55+
<add key="darc-int-dotnet-aspnetcore-6254f5c" value="true" />
5156
<!-- End: Package sources from dotnet-aspnetcore -->
5257
<!-- Begin: Package sources from dotnet-format -->
5358
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
59+
<add key="darc-int-DotNet-msbuild-Trusted-f0cbb13" value="true" />
5460
<!-- End: Package sources from DotNet-msbuild-Trusted -->
5561
<!-- End: Package sources from dotnet-format -->
5662
<!-- End: Package sources from dotnet-aspnetcore -->
5763
<!-- Begin: Package sources from dotnet-runtime -->
64+
<add key="darc-int-dotnet-runtime-362ab66" value="true" />
5865
<!-- End: Package sources from dotnet-runtime -->
5966
<!-- Begin: Package sources from dotnet-windowsdesktop -->
67+
<add key="darc-int-dotnet-windowsdesktop-74e82c7" value="true" />
6068
<!-- End: Package sources from dotnet-windowsdesktop -->
6169
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
6270
</disabledPackageSources>

0 commit comments

Comments
 (0)