Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 6f6f9ab

Browse files
committed
Merged PR 9306: Merge changes from github, update branding to 3.1.401
2 parents 3b9a6ef + d3e60e1 commit 6f6f9ab

File tree

4 files changed

+22
-10
lines changed

4 files changed

+22
-10
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@
4242
</Dependency>
4343
</ProductDependencies>
4444
<ToolsetDependencies>
45-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20326.2">
45+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20365.6">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>ed69753a3ffbdaa08365252c710d57a64d17f859</Sha>
47+
<Sha>7cc59275eade471e29b88a797275818b0d513d0f</Sha>
4848
</Dependency>
4949
</ToolsetDependencies>
5050
<ProductDependencies>
51-
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.400-preview.20360.11">
51+
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.400-servicing.20372.8">
5252
<Uri>https://github.com/dotnet/sdk</Uri>
53-
<Sha>7272da4b33c8f184e79561614a79f6a76725bb4f</Sha>
53+
<Sha>4b0c1aca9239a592552a63e84d09767d9b187adb</Sha>
5454
</Dependency>
5555
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.7-servicing.20371.4">
5656
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
</PropertyGroup>
88
<!-- Repo Version Information -->
99
<PropertyGroup>
10-
<VersionPrefix>3.1.400</VersionPrefix>
11-
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
10+
<VersionPrefix>3.1.401</VersionPrefix>
11+
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
1212
</PropertyGroup>
1313
<!-- Production Dependencies -->
1414
<PropertyGroup>
1515
<!-- "Stage 0" from https://github.com/dotnet/core-sdk -->
16-
<DotNetCoreSdkLKGVersion>3.1.400-preview-015197</DotNetCoreSdkLKGVersion>
16+
<DotNetCoreSdkLKGVersion>3.1.400-preview-015208</DotNetCoreSdkLKGVersion>
1717
</PropertyGroup>
1818
<PropertyGroup>
1919
<!-- Dependencies from https://github.com/dotnet/core-setup -->
@@ -39,7 +39,7 @@
3939
</PropertyGroup>
4040
<PropertyGroup>
4141
<!-- Dependencies from https://github.com/dotnet/sdk -->
42-
<MicrosoftNETSdkPackageVersion>3.1.400-preview.20360.11</MicrosoftNETSdkPackageVersion>
42+
<MicrosoftNETSdkPackageVersion>3.1.400-servicing.20372.8</MicrosoftNETSdkPackageVersion>
4343
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
4444
</PropertyGroup>
4545
<PropertyGroup>

eng/common/templates/post-build/post-build.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,18 @@ stages:
355355
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
356356
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
357357

358+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
359+
parameters:
360+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
361+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
362+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
363+
stageName: 'VS16_8_Publishing'
364+
channelName: 'VS 16.8'
365+
channelId: 1154
366+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
367+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
368+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
369+
358370
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
359371
parameters:
360372
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"tools": {
3-
"dotnet": "3.1.400-preview-015197",
3+
"dotnet": "3.1.400-preview-015208",
44
"runtimes": {
55
"dotnet": [
66
"$(MicrosoftNETCoreAppInternalPackageVersion)"
77
]
88
}
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20326.2"
11+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20365.6"
1212
}
1313
}

0 commit comments

Comments
 (0)