Skip to content

Commit 3d5403b

Browse files
authored
Merge branch 'vs17.12' into backport/pr-11079-to-vs17.12
2 parents ebddc30 + ced3612 commit 3d5403b

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,19 @@
7171
</Dependency>
7272
</ProductDependencies>
7373
<ToolsetDependencies>
74-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25164.2">
74+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25208.6">
7575
<Uri>https://github.com/dotnet/arcade</Uri>
76-
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
76+
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
7777
</Dependency>
7878
<!-- Intermediate is necessary for source build. -->
79-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25164.2">
79+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25208.6">
8080
<Uri>https://github.com/dotnet/arcade</Uri>
81-
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
81+
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
8282
<SourceBuild RepoName="arcade" ManagedOnly="true" />
8383
</Dependency>
84-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25164.2">
84+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25208.6">
8585
<Uri>https://github.com/dotnet/arcade</Uri>
86-
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
86+
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
8787
</Dependency>
8888
<Dependency Name="NuGet.Build.Tasks" Version="6.12.0-rc.106">
8989
<Uri>https://github.com/nuget/nuget.client</Uri>
@@ -98,9 +98,9 @@
9898
<Sha>df4ae6b81013ac45367372176b9c3135a35a7e3c</Sha>
9999
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25164.2">
101+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25208.6">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
103+
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
104104
</Dependency>
105105
</ToolsetDependencies>
106106
</Dependencies>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
33
<Project>
44
<PropertyGroup>
5-
<VersionPrefix>17.12.34</VersionPrefix>
5+
<VersionPrefix>17.12.36</VersionPrefix>
66
<DotNetFinalVersionKind>release</DotNetFinalVersionKind>
77
<PackageValidationBaselineVersion>17.11.4</PackageValidationBaselineVersion>
88
<AssemblyVersion>15.1.0.0</AssemblyVersion>
@@ -50,7 +50,7 @@
5050
Otherwise, this version of dotnet will not be installed and the build will error out. -->
5151
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1))</DotNetCliVersion>
5252
<MicrosoftCodeAnalysisCollectionsVersion>4.2.0-1.22102.8</MicrosoftCodeAnalysisCollectionsVersion>
53-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25164.2</MicrosoftDotNetXUnitExtensionsVersion>
53+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25208.6</MicrosoftDotNetXUnitExtensionsVersion>
5454
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
5555
<MicrosoftIORedistVersion>6.0.1</MicrosoftIORedistVersion>
5656
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.24463.9</MicrosoftNetCompilersToolsetVersion>

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"allowPrerelease": true
44
},
55
"tools": {
6-
"dotnet": "9.0.104",
6+
"dotnet": "9.0.105",
77
"vs": {
88
"version": "17.12.0"
99
},
1010
"xcopy-msbuild": "17.12.0"
1111
},
1212
"msbuild-sdks": {
13-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25164.2"
13+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25208.6"
1414
}
1515
}

0 commit comments

Comments
 (0)