8000 Merge commit '6a5c4fc139bf5c79f68d88be6b470e0743a40e24' · dotnet/winforms@4218aeb · GitHub
[go: up one dir, main page]
Skip to content

Commit 4218aeb

Browse files
author
Mirroring
committed
Merge commit '6a5c4fc139bf5c79f68d88be6b470e0743a40e24'
2 parents a380035 + 6a5c4fc commit 4218aeb

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -179,29 +179,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
179179
</ProductDependencies>
180180
<ToolsetDependencies>
181181
<!-- Arcade -->
182-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25060.1">
182+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25111.4">
183183
<Uri>https://github.com/dotnet/arcade</Uri>
184-
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
184+
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
185185
</Dependency>
186-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25060.1">
186+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25111.4">
187187
<Uri>https://github.com/dotnet/arcade</Uri>
188-
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
188+
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
189189
</Dependency>
190-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25060.1">
190+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25111.4">
191191
<Uri>https://github.com/dotnet/arcade</Uri>
192-
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
192+
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
193193
</Dependency>
194-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25060.1">
194+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25111.4">
195195
<Uri>https://github.com/dotnet/arcade</Uri>
196-
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
196+
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
197197
</Dependency>
198-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25060.1">
198+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25111.4">
199199
<Uri>https://github.com/dotnet/arcade</Uri>
200-
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
200+
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
201201
</Dependency>
202-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25060.1">
202+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25111.4">
203203
<Uri>https://github.com/dotnet/arcade</Uri>
204-
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
204+
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
205205
</Dependency>
206206
</ToolsetDependencies>
207207
</Dependencies>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
</PropertyGroup>
5757
<!-- Arcade -->
5858
<PropertyGroup>
59-
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.25060.1</MicrosoftDotNetGenFacadesPackageVersion>
60-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25060.1</MicrosoftDotNetRemoteExecutorVersion>
61-
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.25060.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
59+
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.25111.4</MicrosoftDotNetGenFacadesPackageVersion>
60+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25111.4</MicrosoftDotNetRemoteExecutorVersion>
61+
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.25111.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
6262
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
6363
</PropertyGroup>
6464
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->

‎eng/common/sdk-task.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

‎eng/common/tools.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
384384

385385
# If the version of msbuild is going to be xcopied,
386386
# use this version. Version matches a package here:
387-
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2
388-
$defaultXCopyMSBuildVersion = '17.8.1-2'
387+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.12.0
388+
$defaultXCopyMSBuildVersion = '17.12.0'
389389

390390
if (!$vsRequirements) {
391391
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

‎global.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.110",
3+
"dotnet": "8.0.113",
44
"runtimes": {
55
"dotnet/x64": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -11,12 +11,12 @@
1111
}
1212
},
1313
"sdk": {
14-
"version": "8.0.110"
14+
"version": "8.0.113"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25060.1",
18-
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25060.1",
19-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25060.1",
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25111.4",
18+
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25111.4",
19+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25111.4",
2020
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
2121
"Microsoft.NET.Sdk.IL": "8.0.14-servicing.25111.18"
2222
},

0 commit comments

Comments
 (0)
0