Skip to content

Commit

Permalink
[manual] Merge release/8.0-staging into release/8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@carlossanlop
carlossanlop committed Jun 11, 2024
2 parents 95ab6fe + fe08496 commit 8d6d92c
Show file tree
Hide file tree
Showing 101 changed files with 1,970 additions and 1,280 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "8.0.0-prerelease.24208.4",
"version": "8.0.0-prerelease.24229.2",
"commands": [
"xharness"
]
Expand Down
3 changes: 2 additions & 1 deletion eng/Subsets.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@
<ProjectToBuild Include="$(CoreClrProjectRoot)nativeaot\BuildIntegration\BuildIntegration.proj" Category="clr" Condition="'$(NativeAotSupported)' == 'true'" />

<ProjectToBuild Condition="'$(NativeAotSupported)' == 'true' and ('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(HostOS)' != '$(TargetOS)' or '$(EnableNativeSanitizers)' != '')" Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler_crossarch.csproj" Category="clr" />
<ProjectToBuild Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' or '$(HostOS)' != '$(TargetOS)' or '$(EnableNativeSanitizers)' != ''" Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_crossarch.csproj" Category="clr" />
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_inbuild.csproj" Category="clr" />

<ProjectToBuild Condition="'$(TargetOS)' == 'windows' or ('$(TargetOS)' == 'linux' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')) or '$(TargetOS)' == 'osx'" Include="$(CoreClrProjectRoot)tools\SuperFileCheck\SuperFileCheck.csproj" Category="clr" />
</ItemGroup>
Expand Down Expand Up @@ -507,6 +507,7 @@
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' != 'Mono' and '$(PgoInstrument)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Crossgen2.sfxproj" />
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-host.proj" />
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-hostfxr.proj" />
<SharedFrameworkProjectToBuild Condition="'$(BuildNETStandard21TargetingPack)' == 'true' and '$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\netstandard2.1.proj" />
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-runtime-deps\*.proj" />
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\archives\dotnet-nethost.proj" />
<SharedFrameworkProjectToBuild Condition="'$(MonoCrossAOTTargetOS)' != ''" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\monocrossaot.sfxproj" Pack="true" />
Expand Down
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@
<Sha>6ed73280a6d70f7e7ac39c86f2abe8c10983f0bb</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24216.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24269.1">
<Uri>https://github.com/dotnet/source-build-externals</Uri>
<Sha>908177a58a41532b3302c17f1e1a8cf1c1234545</Sha>
<Sha>4f2151df120194f0268944f1b723c14820738fc8</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
</ProductDependencies>
Expand Down Expand Up @@ -185,57 +185,57 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24211.2">
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24270.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
</Dependency>
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.24211.2">
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.24270.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.24211.2">
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.24270.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
</Dependency>
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.24211.2">
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.24270.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
</Dependency>
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.24211.2">
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.24270.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.24211.2">
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.24270.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
</Dependency>
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.24211.2">
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.24270.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
</Dependency>
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.24211.2">
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.24270.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
</Dependency>
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.24211.2">
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.24270.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.24211.2">
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.24270.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
</Dependency>
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.24211.2">
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.24270.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.24211.2">
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.24270.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.24211.2">
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.24270.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.23566.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100">
<Uri>https://github.com/dotnet/llvm-project</Uri>
Expand Down Expand Up @@ -322,17 +322,17 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>edbd5c769a19798b6955050baccf99e6797d3208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.24208.4">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.24229.2">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>9d21162000c444b2da3d6cdd805d43e1af51453a</Sha>
<Sha>aacfb6328fdef17e572617bbb551431bb9cb1ff2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.24208.4">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.24229.2">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>9d21162000c444b2da3d6cdd805d43e1af51453a</Sha>
<Sha>aacfb6328fdef17e572617bbb551431bb9cb1ff2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.24208.4">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.24229.2">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>9d21162000c444b2da3d6cdd805d43e1af51453a</Sha>
<Sha>aacfb6328fdef17e572617bbb551431bb9cb1ff2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.24266.3">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand All @@ -354,13 +354,13 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>67613417f5e1af250e6ddfba79f8f2885d8e90fb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.24229.2">
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.24271.1">
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
<Sha>61f137aacabdbd8f279415287a2dd70e150f5eb1</Sha>
<Sha>c804541158619aae93105f54698ca7f149d28232</Sha>
</Dependency>
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.24211.2">
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.24270.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.23566.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down
46 changes: 27 additions & 19 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,20 +143,20 @@
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
<runtimenativeSystemIOPortsVersion>8.0.0-rc.1.23406.6</runtimenativeSystemIOPortsVersion>
<!-- Runtime-Assets dependencies -->
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.24211.2</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.24211.2</SystemComponentModelTypeConverterTestDataVersion>
<SystemDataCommonTestDataVersion>8.0.0-beta.24211.2</SystemDataCommonTestDataVersion>
<SystemDrawingCommonTestDataVersion>8.0.0-beta.24211.2</SystemDrawingCommonTestDataVersion>
<SystemFormatsTarTestDataVersion>8.0.0-beta.24211.2</SystemFormatsTarTestDataVersion>
<SystemIOCompressionTestDataVersion>8.0.0-beta.24211.2</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>8.0.0-beta.24211.2</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>8.0.0-beta.24211.2</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.24211.2</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.24211.2</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.24211.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.24211.2</SystemTextRegularExpressionsTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.24211.2</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.24211.2</MicrosoftDotNetCilStripSourcesVersion>
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.24270.1</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.24270.1</SystemComponentModelTypeConverterTestDataVersion>
<SystemDataCommonTestDataVersion>8.0.0-beta.24270.1</SystemDataCommonTestDataVersion>
<SystemDrawingCommonTestDataVersion>8.0.0-beta.24270.1</SystemDrawingCommonTestDataVersion>
<SystemFormatsTarTestDataVersion>8.0.0-beta.24270.1</SystemFormatsTarTestDataVersion>
<SystemIOCompressionTestDataVersion>8.0.0-beta.24270.1</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>8.0.0-beta.24270.1</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>8.0.0-beta.24270.1</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.24270.1</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.24270.1</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.24270.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.24270.1</SystemTextRegularExpressionsTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.24270.1</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.24270.1</MicrosoftDotNetCilStripSourcesVersion>
<!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx86MIBCRuntimeVersion>
Expand All @@ -165,7 +165,7 @@
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationlinuxarm64MIBCRuntimeVersion>
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.23566.3</optimizationPGOCoreCLRVersion>
<!-- Not auto-updated. -->
<MicrosoftDiaSymReaderNativeVersion>17.8.7-beta1.24113.1</MicrosoftDiaSymReaderNativeVersion>
<MicrosoftDiaSymReaderNativeVersion>17.10.0-beta1.24272.1</MicrosoftDiaSymReaderNativeVersion>
<SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
<TraceEventVersion>3.0.3</TraceEventVersion>
<NETStandardLibraryRefVersion>2.1.0</NETStandardLibraryRefVersion>
Expand All @@ -183,10 +183,10 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.24208.4</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.24208.4</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.24208.4</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.24229.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.24229.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.24229.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.24229.2</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.24271.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.2</XUnitVersion>
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
<XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>
Expand Down Expand Up @@ -260,4 +260,12 @@
<MicrosoftDotnetSdkInternalVersion>8.0.101</MicrosoftDotnetSdkInternalVersion>
<SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
</PropertyGroup>
<PropertyGroup>
<!--
Targeting pack package for NETStandard 2.1 gets rebuilt on demand.
Set to rebuild with 8.0.8 release, and automatically disabled after that.
-->
<BuildNETStandard21TargetingPack Condition="'$(PatchVersion)' == '8'">true</BuildNETStandard21TargetingPack>
</PropertyGroup>
</Project>
Loading

0 comments on commit 8d6d92c

Please sign in to comment.