Skip to content

Commit 5f4b38e

Browse files
SteveSandersonMSSteveSandersonMS
authored
Merge branch 'release/8.0' into merge/release/8.0-rc2-to-release/8.0
2 parents a0c7939 + 470af14 commit 5f4b38e

File tree

3 files changed

+25
-24
lines changed

3 files changed

+25
-24
lines changed

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@
189189
<Uri>https://github.com/dotnet/runtime</Uri>
190190
<Sha>9cdbc87dadbf358206f20f17fed005cdcb253452</Sha>
191191
</Dependency>
192-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23468.1">
192+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23469.1">
193193
<Uri>https://github.com/dotnet/source-build-externals</Uri>
194-
<Sha>e9d6489787a5ea5400a31dfa34aa6ad6b590de9b</Sha>
194+
<Sha>c42a7ce3b6fa02957e7b4ef995c5c2a9a23d294c</Sha>
195195
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
196196
</Dependency>
197197
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.0.0-beta-23228-03">
@@ -338,9 +338,9 @@
338338
<Sha>9a1c3e1b7f0c8763d4c96e593961a61a72679a7b</Sha>
339339
<SourceBuild RepoName="xdt" ManagedOnly="true" />
340340
</Dependency>
341-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23463.1">
341+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23469.1">
342342
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
343-
<Sha>3dd2c0ef203db8fe0e849557960b4cd009afbaac</Sha>
343+
<Sha>d825c6693d4e26f63aaa93c3c1d057faa098e347</Sha>
344344
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
345345
</Dependency>
346346
<!-- Not updated automatically -->
@@ -376,26 +376,26 @@
376376
<Uri>https://github.com/dotnet/winforms</Uri>
377377
<Sha>0c5eb6c55e7bd273375c3e60c2e6ea8432a54058</Sha>
378378
</Dependency>
379-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23451.1">
379+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23463.1">
380380
<Uri>https://github.com/dotnet/arcade</Uri>
381-
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
381+
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
382382
<SourceBuild RepoName="arcade" ManagedOnly="true" />
383383
</Dependency>
384-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23451.1">
384+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23463.1">
385385
<Uri>https://github.com/dotnet/arcade</Uri>
386-
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
386+
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
387387
</Dependency>
388-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23451.1">
388+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23463.1">
389389
<Uri>https://github.com/dotnet/arcade</Uri>
390-
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
390+
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
391391
</Dependency>
392-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23451.1">
392+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23463.1">
393393
<Uri>https://github.com/dotnet/arcade</Uri>
394-
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
394+
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
395395
</Dependency>
396-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23451.1">
396+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23463.1">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
398+
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
399399
</Dependency>
400400
<Dependency Name="Microsoft.Extensions.Telemetry.Testing" Version="8.0.0-rc.2.23461.3">
401401
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@
99
<AspNetCoreMajorVersion>8</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
1111
<AspNetCorePatchVersion>0</AspNetCorePatchVersion>
12-
<PreReleaseVersionIteration>2</PreReleaseVersionIteration>
12+
<PreReleaseVersionIteration>
13+
</PreReleaseVersionIteration>
1314
<ValidateBaseline>true</ValidateBaseline>
1415
<IdentityModelVersion>7.0.0</IdentityModelVersion>
1516
<!--
1617
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1718
-->
1819
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1920
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
20-
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
21-
<PreReleaseBrandingLabel>Release Candidate $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>
21+
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
22+
<PreReleaseBrandingLabel>RTM</PreReleaseBrandingLabel>
2223
<IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>
2324
<IncludePreReleaseLabelInPackageVersion Condition=" '$(DotNetFinalVersionKind)' == 'release' ">false</IncludePreReleaseLabelInPackageVersion>
2425
<AspNetCoreMajorMinorVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</AspNetCoreMajorMinorVersion>
@@ -160,13 +161,13 @@
160161
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
161162
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
162163
<!-- Packages from dotnet/arcade -->
163-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23451.1</MicrosoftDotNetBuildTasksInstallersVersion>
164-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23451.1</MicrosoftDotNetBuildTasksTemplatingVersion>
165-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23451.1</MicrosoftDotNetRemoteExecutorVersion>
164+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23463.1</MicrosoftDotNetBuildTasksInstallersVersion>
165+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23463.1</MicrosoftDotNetBuildTasksTemplatingVersion>
166+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23463.1</MicrosoftDotNetRemoteExecutorVersion>
166167
<!-- Packages from dotnet/source-build-externals -->
167-
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.23468.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
168+
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.23469.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
168169
<!-- Packages from dotnet/source-build-reference-packages -->
169-
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.23463.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
170+
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.23469.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
170171
<!-- Packages from dotnet/symreader -->
171172
<MicrosoftSourceBuildIntermediatesymreaderVersion>2.0.0-beta-23228-03</MicrosoftSourceBuildIntermediatesymreaderVersion>
172173
<!-- Packages from dotnet/runtime -->

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.10",
30-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23451.1",
31-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23451.1"
30+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1",
31+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23463.1"
3232
}
3333
}

0 commit comments

Comments
 (0)