[xcode14] Merge release/6.0.400 into xcode14 (#15686)
We had a bunch of conflicting CI changes, I just took Xcode14 as the source of truth for those.
This commit is contained in:
Родитель
b6ece9e175
Коммит
652353a6f7
|
@ -620,7 +620,7 @@ endif
|
|||
# The sdk version band has the last two digits set to 0: https://github.com/dotnet/sdk/blob/22c4860dcb2cf6b123dd641cc4a87a50380759d5/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs#L52-L53
|
||||
DOTNET_MANIFEST_VERSION_BAND=$(shell echo $(DOTNET_VERSION_BAND) | sed 's/..$$/00/')
|
||||
# We must do the same for our version band: the last two digits must be set to 0.
|
||||
MANIFEST_VERSION_BAND=6.0.300
|
||||
MANIFEST_VERSION_BAND=6.0.400
|
||||
# The toolchain can either be hardcoded to something like 6.0.200, or set to MANIFEST_VERSION_BAND.
|
||||
# Typically it should be MANIFEST_VERSION_BAND, but it usually takes a while after MANIFEST_VERSION_BAND is bumped
|
||||
# for this to follow suit, in which case we can keep things working by hardcoding the previous version band.
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-pub-dotnet-runtime-f8bf0fc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-f8bf0fcc/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-runtime-00f82ac" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-00f82acf/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!--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" protocolVersion="3" />
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.301-rtm.22280.1">
|
||||
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.400-preview.22324.6">
|
||||
<Uri>https://github.com/dotnet/installer</Uri>
|
||||
<Sha>283e9cfd1967d94e7d6dbc53b166c58e847b31e3</Sha>
|
||||
<Sha>8fca50514f4db049f5559917964775c0d247e851</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.200-1.22219.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
<Uri>https://github.com/dotnet/linker</Uri>
|
||||
|
@ -10,7 +10,7 @@
|
|||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.8">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f8bf0fcc30d2e1f606266db1b644266c7bdbf063</Sha>
|
||||
<Sha>00f82acfe45b217bed2c7071828939a9f271253f</Sha>
|
||||
</Dependency>
|
||||
<!-- This is required for our test apps to build; in some cases Microsoft.AspNetCore.App is pulled in, and when building test apps the build needs to be able to resolve that -->
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<Project>
|
||||
<!--Package versions-->
|
||||
<PropertyGroup>
|
||||
<MicrosoftDotnetSdkInternalPackageVersion>6.0.301-rtm.22280.1</MicrosoftDotnetSdkInternalPackageVersion>
|
||||
<MicrosoftDotnetSdkInternalPackageVersion>6.0.400-preview.22324.6</MicrosoftDotnetSdkInternalPackageVersion>
|
||||
<MicrosoftNETILLinkTasksPackageVersion>6.0.200-1.22219.3</MicrosoftNETILLinkTasksPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
|
||||
<MicrosoftNETILStripTasksPackageVersion>6.0.0-rc.2.21468.3</MicrosoftNETILStripTasksPackageVersion>
|
||||
|
|
Загрузка…
Ссылка в новой задаче