mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merged PR 35299: [internal/release/8.0.1xx] Merge from public

Browse source 
Merge from public release/8.0.1xx to internal/release/8.0.1xx and resolve conflicts if necessary
This commit is contained in:
Matt Mitchell 2023-11-17 21:49:46 +00:00
commit c2cd2e3b12
7 changed files with 18 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

20
eng/Version.Details.xml
View file

@ -193,9 +193,9 @@
<Sha>5957c5c5f85f17c145e7fab4ece37ad6aafcded9</Sha>
<SourceBuild RepoName="deployment-tools" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23518.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23566.2">
<Uri>https://github.com/dotnet/source-build-externals</Uri>
<Sha>3dc05150cf234f76f6936dcb2853d31a0da1f60e</Sha>
<Sha>776b128c95ef681d125adc3eb69f12d480418bb5</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.1.0-beta.23253.1">
@ -214,18 +214,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23516.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23564.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>39042b4048580366d35a7c1c4f4ce8fc0dbea4b4</Sha>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23516.4">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23564.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>39042b4048580366d35a7c1c4f4ce8fc0dbea4b4</Sha>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23516.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23564.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>39042b4048580366d35a7c1c4f4ce8fc0dbea4b4</Sha>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23551.2">
<Uri>https://github.com/dotnet/arcade-services</Uri>
@ -239,9 +239,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>af841c8b33cecc92d74222298f1e45bf7bf3d90a</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23516.4">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23565.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>b4fa7f2e1e65ef49881be2ab2df27624280a8c55</Sha>
<Sha>95f83e27806330fec09edd96e06bba3acabe3f35</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

6
global.json
View file

@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "8.0.100-rtm.23506.1",
"dotnet": "8.0.100",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23516.4",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23516.4"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23564.4",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23564.4"
}
}

4
src/SourceBuild/content/eng/Versions.props
View file

@ -30,7 +30,7 @@
These URLs can't be composed from their base URL and version as we read them from the
prep.sh and pipeline scripts, outside of MSBuild.
-->
<PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-rc.2.23502.1.centos.8-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
<PrivateSourceBuiltSdkUrl_CentOS8Stream>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-rc.2.23502.1-centos.8-x64.tar.gz</PrivateSourceBuiltSdkUrl_CentOS8Stream>
<PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-rtm.23551.1.centos.8-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
<PrivateSourceBuiltSdkUrl_CentOS8Stream>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-centos.8-x64.tar.gz</PrivateSourceBuiltSdkUrl_CentOS8Stream>
</PropertyGroup>
</Project>

14
src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props
View file

@ -5,19 +5,5 @@
<NonshippingRuntimeVersionFor700>7.0.4-servicing.23107.6</NonshippingRuntimeVersionFor700>
<MicrosoftNETCoreTestHostVersion>$(NonshippingRuntimeVersionFor700)</MicrosoftNETCoreTestHostVersion>
<Msft80RC2RuntimeVersion>8.0.0-rc.2.23479.6</Msft80RC2RuntimeVersion>
<MicrosoftNETCoreAppCrossgen2Version>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreAppCrossgen2Version>
<MicrosoftNETCoreAppHostPackageVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreAppHostPackageVersion>
<MicrosoftNETCoreAppRuntimeVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreAppRuntimeVersion>
<MicrosoftNETILLinkTasksVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETILLinkTasksVersion>
<MicrosoftDotNetILCompilerVersion>$(Msft80RC2RuntimeVersion)</MicrosoftDotNetILCompilerVersion>
<MicrosoftNETCoreDotNetAppHostVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreDotNetAppHostVersion>
<MicrosoftNETCoreDotNetHostVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreDotNetHostVersion>
<MicrosoftNETCoreDotNetHostPolicyVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreDotNetHostPolicyVersion>
<MicrosoftNETCoreDotNetHostResolverVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreDotNetHostResolverVersion>
<MicrosoftNETCoreILAsmVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreILDAsmVersion>
<RuntimeNativeSystemIOPortsVersion>$(Msft80RC2RuntimeVersion)</RuntimeNativeSystemIOPortsVersion>
</PropertyGroup>
</Project>

2
src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
View file

@ -47,8 +47,6 @@
<!-- These packages don't actually exist -->
<ExcludedPackage Include="runtime.linux-musl-x64.runtime.native.System.IO.Ports" />
<ExcludedPackage Include="runtime.linux-musl-arm64.runtime.native.System.IO.Ports" />
<PackageDownload Include="Microsoft.NET.ILLink.Tasks" Version="[$(MicrosoftNETILLinkTasksVersion)]" />
</ItemGroup>
<Target Name="GetPackagesToDownload"

2
src/SourceBuild/content/global.json
View file

@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "8.0.100-rc.2.23502.2"
"dotnet": "8.0.100"
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1",

5
src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs
View file

@ -56,10 +56,9 @@ public class SourceBuiltArtifactsTests : SdkTests
DirectoryInfo sdkDir = new DirectoryInfo(Path.Combine(outputDir, "sdk"));
string sdkVersionPath = sdkDir.GetFiles(".version", SearchOption.AllDirectories).Single().FullName;
string[] sdkVersionLines = File.ReadAllLines(Path.Combine(outputDir, sdkVersionPath));
string expectedSdkVersion = sdkVersionLines[1];
string expectedSdkVersion = sdkVersionLines[3]; // Get the unique, non-stable, SDK version
// Disable due to https://github.com/dotnet/source-build/issues/3693
// Assert.Equal(expectedSdkVersion, sdkVersion);
Assert.Equal(expectedSdkVersion, sdkVersion);
}
finally
{