Skip to content

Commit 6cc5257

Browse files
radicalradical
authored
Merge branch 'release/8.0' into merge/release/8.0-rc2-to-release/8.0
2 parents 974edf9 + e95228d commit 6cc5257

3 files changed

Lines changed: 40 additions & 38 deletions

File tree

‎eng/Version.Details.xml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -90,19 +90,19 @@
9090
<Sha>89be445dd4936157533ad96bafb95f701430653a</Sha>
9191
<SourceBuild RepoName="cecil" ManagedOnly="true" />
9292
</Dependency>
93-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.2.23471.3">
93+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rtm.23470.1">
9494
<Uri>https://github.com/dotnet/emsdk</Uri>
95-
<Sha>190be5fe0709de5a3507448151c7fc84abff8628</Sha>
95+
<Sha>446eeb331fcbf2f48c14a377601a8ab950ec942e</Sha>
9696
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
9797
</Dependency>
98-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23469.1">
98+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23471.1">
9999
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
100-
<Sha>d825c6693d4e26f63aaa93c3c1d057faa098e347</Sha>
100+
<Sha>7b55da982fc6e71c1776c4de89111aee0eecb45a</Sha>
101101
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
102102
</Dependency>
103-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23468.1">
103+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23471.2">
104104
<Uri>https://github.com/dotnet/source-build-externals</Uri>
105-
<Sha>e9d6489787a5ea5400a31dfa34aa6ad6b590de9b</Sha>
105+
<Sha>6dbf3aaa0fc9664df86462f5c70b99800934fccd</Sha>
106106
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
107107
</Dependency>
108108
</ProductDependencies>
@@ -334,21 +334,21 @@
334334
<Uri>https://github.com/dotnet/arcade</Uri>
335335
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
336336
</Dependency>
337-
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23465.3">
337+
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23471.3">
338338
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
339-
<Sha>f67c4e806a744f7274aed9493e4c8d39a3c73445</Sha>
339+
<Sha>ee166d79f3a269d2a1c6b7d400df7e284b1aa67b</Sha>
340340
</Dependency>
341-
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.23465.3">
341+
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.23471.3">
342342
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
343-
<Sha>f67c4e806a744f7274aed9493e4c8d39a3c73445</Sha>
343+
<Sha>ee166d79f3a269d2a1c6b7d400df7e284b1aa67b</Sha>
344344
</Dependency>
345-
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.23465.3">
345+
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.23471.3">
346346
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
347-
<Sha>f67c4e806a744f7274aed9493e4c8d39a3c73445</Sha>
347+
<Sha>ee166d79f3a269d2a1c6b7d400df7e284b1aa67b</Sha>
348348
</Dependency>
349-
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.23465.3">
349+
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.23471.3">
350350
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
351-
<Sha>f67c4e806a744f7274aed9493e4c8d39a3c73445</Sha>
351+
<Sha>ee166d79f3a269d2a1c6b7d400df7e284b1aa67b</Sha>
352352
</Dependency>
353353
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.23461.1">
354354
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
@@ -358,18 +358,18 @@
358358
<Uri>https://github.com/dotnet/runtime-assets</Uri>
359359
<Sha>99168dcff56809205e7ef8530d1256f3a07fab1f</Sha>
360360
</Dependency>
361-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-3.23469.1">
361+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-3.23471.11">
362362
<Uri>https://github.com/dotnet/roslyn</Uri>
363-
<Sha>9233e36abc5e2ca263dbd4d1616f35623440a935</Sha>
363+
<Sha>bdd9c5ba66b00beebdc3516acc5e29b83efd89af</Sha>
364364
</Dependency>
365-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-3.23469.1">
365+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-3.23471.11">
366366
<Uri>https://github.com/dotnet/roslyn</Uri>
367-
<Sha>9233e36abc5e2ca263dbd4d1616f35623440a935</Sha>
367+
<Sha>bdd9c5ba66b00beebdc3516acc5e29b83efd89af</Sha>
368368
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
369369
</Dependency>
370-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-3.23469.1">
370+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-3.23471.11">
371371
<Uri>https://github.com/dotnet/roslyn</Uri>
372-
<Sha>9233e36abc5e2ca263dbd4d1616f35623440a935</Sha>
372+
<Sha>bdd9c5ba66b00beebdc3516acc5e29b83efd89af</Sha>
373373
</Dependency>
374374
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23468.1">
375375
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
@@ -384,13 +384,13 @@
384384
<Sha>d10b02ae5cc670609d920a672985ed4456bdd6b6</Sha>
385385
<SourceBuild RepoName="sdk" ManagedOnly="true" />
386386
</Dependency>
387-
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.23465.3">
387+
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.23471.3">
388388
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
389-
<Sha>f67c4e806a744f7274aed9493e4c8d39a3c73445</Sha>
389+
<Sha>ee166d79f3a269d2a1c6b7d400df7e284b1aa67b</Sha>
390390
</Dependency>
391-
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.23465.3">
391+
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.23471.3">
392392
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
393-
<Sha>f67c4e806a744f7274aed9493e4c8d39a3c73445</Sha>
393+
<Sha>ee166d79f3a269d2a1c6b7d400df7e284b1aa67b</Sha>
394394
</Dependency>
395395
<!-- Necessary for source-build. This allows the package to be retrieved from previously-source-built artifacts
396396
and flow in as dependencies of the packages produced by runtime. -->

‎eng/Versions.props‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99
<SdkBandVersion>8.0.100</SdkBandVersion>
1010
<PackageVersionNet7>7.0.12</PackageVersionNet7>
1111
<PackageVersionNet6>6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet7)').Build),11))</PackageVersionNet6>
12-
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
13-
<PreReleaseVersionIteration>2</PreReleaseVersionIteration>
12+
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
13+
<PreReleaseVersionIteration>
14+
</PreReleaseVersionIteration>
1415
<!-- Enable to remove prerelease label. -->
1516
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1617
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
17-
<WorkloadVersionSuffix Condition="'$(DotNetFinalVersionKind)' != 'release'">-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</WorkloadVersionSuffix>
18+
<WorkloadVersionSuffix Condition="'$(DotNetFinalVersionKind)' != 'release' and '$(PreReleaseVersionIteration)' == ''">-$(PreReleaseVersionLabel)</WorkloadVersionSuffix>
19+
<WorkloadVersionSuffix Condition="'$(WorkloadVersionSuffix)' == '' and '$(DotNetFinalVersionKind)' != 'release'">-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</WorkloadVersionSuffix>
1820
<SdkBandVersionForWorkload_FromRuntimeVersions>$(SdkBandVersion)$(WorkloadVersionSuffix)</SdkBandVersionForWorkload_FromRuntimeVersions>
1921
<!-- set to false for release branches -->
2022
<WorkloadsTestPreviousVersions Condition="'$(WorkloadsTestPreviousVersions)' == ''">false</WorkloadsTestPreviousVersions>
@@ -42,9 +44,9 @@
4244
Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
4345
they do not break the local dev experience.
4446
-->
45-
<MicrosoftCodeAnalysisCSharpVersion>4.8.0-3.23469.1</MicrosoftCodeAnalysisCSharpVersion>
46-
<MicrosoftCodeAnalysisVersion>4.8.0-3.23469.1</MicrosoftCodeAnalysisVersion>
47-
<MicrosoftNetCompilersToolsetVersion>4.8.0-3.23469.1</MicrosoftNetCompilersToolsetVersion>
47+
<MicrosoftCodeAnalysisCSharpVersion>4.8.0-3.23471.11</MicrosoftCodeAnalysisCSharpVersion>
48+
<MicrosoftCodeAnalysisVersion>4.8.0-3.23471.11</MicrosoftCodeAnalysisVersion>
49+
<MicrosoftNetCompilersToolsetVersion>4.8.0-3.23471.11</MicrosoftNetCompilersToolsetVersion>
4850
</PropertyGroup>
4951
<!--
5052
For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.
@@ -156,12 +158,12 @@
156158
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.23421.1</SystemWindowsExtensionsTestDataVersion>
157159
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.23421.1</MicrosoftDotNetCilStripSourcesVersion>
158160
<!-- dotnet-optimization dependencies -->
159-
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23465.3</optimizationwindows_ntx64MIBCRuntimeVersion>
160-
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23465.3</optimizationwindows_ntx86MIBCRuntimeVersion>
161-
<optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.23465.3</optimizationwindows_ntarm64MIBCRuntimeVersion>
162-
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.23465.3</optimizationlinuxx64MIBCRuntimeVersion>
163-
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.23465.3</optimizationlinuxarm64MIBCRuntimeVersion>
164-
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.23465.3</optimizationPGOCoreCLRVersion>
161+
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23471.3</optimizationwindows_ntx64MIBCRuntimeVersion>
162+
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23471.3</optimizationwindows_ntx86MIBCRuntimeVersion>
163+
<optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.23471.3</optimizationwindows_ntarm64MIBCRuntimeVersion>
164+
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.23471.3</optimizationlinuxx64MIBCRuntimeVersion>
165+
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.23471.3</optimizationlinuxarm64MIBCRuntimeVersion>
166+
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.23471.3</optimizationPGOCoreCLRVersion>
165167
<!-- Not auto-updated. -->
166168
<MicrosoftDiaSymReaderNativeVersion>16.11.29-beta1.23404.4</MicrosoftDiaSymReaderNativeVersion>
167169
<SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
@@ -238,7 +240,7 @@
238240
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
239241
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport
240242
-->
241-
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rc.2.23471.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
243+
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rtm.23470.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
242244
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</MicrosoftNETRuntimeEmscriptenVersion>
243245
<!-- workloads -->
244246
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

‎src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public partial class InstallWorkloadFromArtifacts : Task
4949
private string _tempDir = string.Empty;
5050
private string _nugetCachePath = string.Empty;
5151

52-
[GeneratedRegex(@"^\d+\.\d+\.\d+(-[A-z]*\.*\d*)?")]
52+
[GeneratedRegex(@"^\d+\.\d+\.\d+(-rtm|-[A-z]*\.*\d*)?")]
5353
private static partial Regex bandVersionRegex();
5454

5555
public override bool Execute()

0 commit comments

Comments
 (0)