Skip to content

Commit 9f65a81

Browse files
committed
Merge in 'release/6.0' changes
2 parents 1dbf16f + 4b84c37 commit 9f65a81

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -126,29 +126,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
126126
</ProductDependencies>
127127
<ToolsetDependencies>
128128
<!-- Arcade -->
129-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22159.8">
129+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22161.1">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>4f4c8c392d1c51e630f4571e39a095da7fb172c5</Sha>
131+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22159.8">
133+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22161.1">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>4f4c8c392d1c51e630f4571e39a095da7fb172c5</Sha>
135+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22159.8">
137+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22161.1">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>4f4c8c392d1c51e630f4571e39a095da7fb172c5</Sha>
139+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22159.8">
141+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22161.1">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>4f4c8c392d1c51e630f4571e39a095da7fb172c5</Sha>
143+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22159.8">
145+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22161.1">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>4f4c8c392d1c51e630f4571e39a095da7fb172c5</Sha>
147+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22159.8">
149+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22161.1">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>4f4c8c392d1c51e630f4571e39a095da7fb172c5</Sha>
151+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
152152
</Dependency>
153153
</ToolsetDependencies>
154154
</Dependencies>

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
</PropertyGroup>
5252
<!-- Arcade -->
5353
<PropertyGroup>
54-
<MicrosoftDotNetGenFacadesPackageVersion>6.0.0-beta.22159.8</MicrosoftDotNetGenFacadesPackageVersion>
55-
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22159.8</MicrosoftDotNetRemoteExecutorVersion>
56-
<MicrosoftDotNetXUnitExtensionsPackageVersion>6.0.0-beta.22159.8</MicrosoftDotNetXUnitExtensionsPackageVersion>
54+
<MicrosoftDotNetGenFacadesPackageVersion>6.0.0-beta.22161.1</MicrosoftDotNetGenFacadesPackageVersion>
55+
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22161.1</MicrosoftDotNetRemoteExecutorVersion>
56+
<MicrosoftDotNetXUnitExtensionsPackageVersion>6.0.0-beta.22161.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
5757
<MicrosoftNETTestSdkVersion>16.5.0</MicrosoftNETTestSdkVersion>
5858
</PropertyGroup>
5959
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
"version": "6.0.103"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22159.8",
18-
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22159.8",
19-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22159.8",
17+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22161.1",
18+
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22161.1",
19+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22161.1",
2020
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
2121
"Microsoft.NET.Sdk.IL": "6.0.3-servicing.22123.9"
2222
},

0 commit comments

Comments
 (0)