Skip to content

Commit 4c6814f

Browse files
author
Jason Zhai
committed
Merge branch 'main' of https://github.com/dotnet/sdk into merge/release/9.0.2xx-to-main
2 parents 42f997e + f0ec485 commit 4c6814f

File tree

227 files changed

+8622
-6977
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

227 files changed

+8622
-6977
lines changed

‎Directory.Build.props

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,18 @@
7777
<Using Include="System.Xml.Linq" />
7878
</ItemGroup>
7979

80+
<!-- These aliases need to live outside of Versions.props as VMR / source-build overwrites some of the version properties for live builds. -->
81+
<PropertyGroup>
82+
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->
83+
<MicrosoftNETCoreAppHostPackageVersion>$(MicrosoftNETCoreAppHostwinx64PackageVersion)</MicrosoftNETCoreAppHostPackageVersion>
84+
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
85+
<MicrosoftAspNetCoreAppRuntimePackageVersion>$(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)</MicrosoftAspNetCoreAppRuntimePackageVersion>
86+
<MicrosoftWindowsDesktopAppRuntimePackageVersion>$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)</MicrosoftWindowsDesktopAppRuntimePackageVersion>
87+
88+
<HostFxrVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</HostFxrVersion>
89+
<SharedHostVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedHostVersion>
90+
</PropertyGroup>
91+
8092
<Import Project="build/GenerateResxSource.targets" />
93+
8194
</Project>

‎Directory.Build.targets

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
33
<Project>
4+
45
<ItemGroup>
56
<SupportedPlatform Remove="Android" />
67
<SupportedPlatform Remove="iOS" />
@@ -36,13 +37,18 @@
3637

3738
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
3839

40+
<PropertyGroup>
41+
<FullNugetVersion>$(VersionPrefix)-$(PreReleaseVersionLabel)</FullNugetVersion>
42+
<FullNugetVersion Condition="'$(PreReleaseVersionIteration)' != ''">$(FullNugetVersion).$(PreReleaseVersionIteration)</FullNugetVersion>
43+
<FullNugetVersion Condition=" '$(VersionSuffixDateStamp)' != '' And '$(VersionSuffixBuildOfTheDay)' != '' ">$(FullNugetVersion).$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay)</FullNugetVersion>
44+
</PropertyGroup>
45+
3946
<!-- Optionally override arcade's test target with one which will run the tests as tools.
4047
Conditionally overriding a target requires a conditional import of another (.targets)
4148
file. -->
4249
<Import Project="OverrideTest.targets"
4350
Condition="'$(RunTestsAsTool)' == 'true' And '$(CanRunTestAsTool)' == 'true'"/>
4451

45-
4652
<!-- Update KnownFrameworkReferences to target the right version of the runtime -->
4753
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'
4854
and $(MicrosoftNETCoreAppRefPackageVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))

‎NuGet.config

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,9 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-aspire -->
7-
<add key="darc-pub-dotnet-aspire-a1f7880-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspire-a1f7880a-1/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-aspire -->
9-
<!-- Begin: Package sources from dotnet-aspnetcore -->
10-
<!-- End: Package sources from dotnet-aspnetcore -->
11-
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
12-
<!-- End: Package sources from DotNet-msbuild-Trusted -->
13-
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
14-
<!-- End: Package sources from dotnet-roslyn-analyzers -->
158
<!-- Begin: Package sources from dotnet-runtime -->
16-
<add key="darc-int-dotnet-runtime-e77011b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3/nuget/v3/index.json" />
17-
<add key="darc-int-dotnet-runtime-e77011b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-5/nuget/v3/index.json" />
18-
<add key="darc-int-dotnet-runtime-e77011b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-3/nuget/v3/index.json" />
19-
<add key="darc-int-dotnet-runtime-e77011b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-2/nuget/v3/index.json" />
20-
<add key="darc-int-dotnet-runtime-e77011b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-1/nuget/v3/index.json" />
219
<!-- End: Package sources from dotnet-runtime -->
22-
<!-- Begin: Package sources from dotnet-templating -->
23-
<!-- End: Package sources from dotnet-templating -->
24-
<!-- Begin: Package sources from dotnet-windowsdesktop -->
25-
<!-- End: Package sources from dotnet-windowsdesktop -->
2610
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2711
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
2812
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
@@ -46,20 +30,10 @@
4630
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
4731
</packageSources>
4832
<disabledPackageSources>
33+
<clear />
4934
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
50-
<!-- Begin: Package sources from dotnet-templating -->
51-
<!-- End: Package sources from dotnet-templating -->
52-
<!-- Begin: Package sources from dotnet-aspnetcore -->
53-
<!-- End: Package sources from dotnet-aspnetcore -->
5435
<!-- Begin: Package sources from dotnet-runtime -->
55-
<add key="darc-int-dotnet-runtime-e77011b-1" value="true" />
56-
<add key="darc-int-dotnet-runtime-e77011b-2" value="true" />
57-
<add key="darc-int-dotnet-runtime-e77011b-3" value="true" />
58-
<add key="darc-int-dotnet-runtime-e77011b-5" value="true" />
59-
<add key="darc-int-dotnet-runtime-e77011b" value="true" />
6036
<!-- End: Package sources from dotnet-runtime -->
61-
<!-- Begin: Package sources from dotnet-windowsdesktop -->
62-
<!-- End: Package sources from dotnet-windowsdesktop -->
6337
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
6438
</disabledPackageSources>
6539
</configuration>

0 commit comments

Comments
 (0)