Skip to content

Commit 90251e6

Browse files
committed
Merge in 'release/6.0' changes
2 parents 294b19a + fbc85ef commit 90251e6

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

eng/Version.Details.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -83,25 +83,25 @@
8383
</Dependency>
8484
</ProductDependencies>
8585
<ToolsetDependencies>
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24162.4">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24163.13">
8787
<Uri>https://github.com/dotnet/arcade</Uri>
88-
<Sha>c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75</Sha>
88+
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24162.4">
90+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24163.13">
9191
<Uri>https://github.com/dotnet/arcade</Uri>
92-
<Sha>c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75</Sha>
92+
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24162.4">
94+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24163.13">
9595
<Uri>https://github.com/dotnet/arcade</Uri>
96-
<Sha>c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75</Sha>
96+
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24162.4">
98+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24163.13">
9999
<Uri>https://github.com/dotnet/arcade</Uri>
100-
<Sha>c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75</Sha>
100+
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24162.4">
102+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24163.13">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75</Sha>
104+
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
105105
</Dependency>
106106
</ToolsetDependencies>
107107
</Dependencies>

eng/Versions.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
</PropertyGroup>
5757
<!-- Packages that come from https://github.com/dotnet/arcade -->
5858
<PropertyGroup>
59-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.24162.4</MicrosoftDotNetApiCompatVersion>
60-
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.24162.4</MicrosoftDotNetCodeAnalysisPackageVersion>
61-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24162.4</MicrosoftDotNetGenAPIVersion>
59+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.24163.13</MicrosoftDotNetApiCompatVersion>
60+
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.24163.13</MicrosoftDotNetCodeAnalysisPackageVersion>
61+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24163.13</MicrosoftDotNetGenAPIVersion>
6262
</PropertyGroup>
6363
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
6464
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->

eng/common/SetupNugetSources.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
4949
Write-Host "Package source $SourceName already present."
5050
}
5151

52-
AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $pwd
52+
AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd
5353
}
5454

5555
# Add a credential node for the specified source

global.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "6.0.127",
3+
"dotnet": "6.0.128",
44
"runtimes": {
55
"dotnet": [
66
"2.1.7",
@@ -12,11 +12,11 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24162.4",
16-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24162.4"
15+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24163.13",
16+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24163.13"
1717
},
1818
"sdk": {
19-
"version": "6.0.127"
19+
"version": "6.0.128"
2020
},
2121
"native-tools": {
2222
"strawberry-perl": "5.28.1.1-1",

0 commit comments

Comments
 (0)