Skip to content

Commit 723171a

Browse files
sfoslundsfoslund
authored
Merge pull request #4053 from dotnet-maestro-bot/merge/release/3.1.1xx-to-release/3.1.2xx
[automated] Merge branch 'release/3.1.1xx' => 'release/3.1.2xx'
2 parents 2ee3531 + 25cb182 commit 723171a

File tree

6 files changed

+58
-18
lines changed

6 files changed

+58
-18
lines changed

‎.vsts-ci.yml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ variables:
88
value: Roslyn-Project-System
99
- name: _DotNetArtifactsCategory
1010
value: Toolset
11-
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
11+
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
1212
- name: PB_PublishBlobFeedKey
13-
value:
13+
value: ''
1414
- name: PB_PublishBlobFeedUrl
15-
value:
15+
value: ''
1616
- name: _DotNetPublishToBlobFeed
1717
value: false
1818
- name: _PublishUsingPipelines
1919
value: false
2020
- name: _PublishType
2121
value: none
22-
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
22+
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
2323
- name: PB_PublishBlobFeedUrl
2424
value: https://dotnetfeed.blob.core.windows.net/dotnet-toolset/index.json
2525
- name: _DotNetPublishToBlobFeed
@@ -30,6 +30,14 @@ variables:
3030
value: blob
3131
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
3232
- group: DotNet-CLI-SDLValidation-Params
33+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
34+
- group: DotNet-MSRC-Storage
35+
- name: _InternalRuntimeDownloadArgs
36+
value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet
37+
/p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
38+
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
39+
- name: _InternalRuntimeDownloadArgs
40+
value: ''
3341

3442
stages:
3543
- stage: build
@@ -41,15 +49,15 @@ stages:
4149
name: Hosted VS2017
4250
strategy:
4351
matrix:
44-
${{ if eq(variables['System.TeamProject'], 'public') }}:
52+
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
4553
Build_Debug_x86:
4654
_BuildConfig: Debug
4755
_BuildArchitecture: x86
4856
Build_Release_x64:
4957
_BuildConfig: Release
5058
_BuildArchitecture: x64
5159

52-
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
60+
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
5361
- template: /eng/build.yml
5462
parameters:
5563
agentOs: Linux

‎NuGet.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
<packageSources>
55
<clear />
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
7+
<add key="darc-pub-dotnet-core-setup-916b5cb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-916b5cba/nuget/v3/index.json" />
78
<add key="darc-pub-dotnet-corefx-0f7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-0f7f38c4/nuget/v3/index.json" />
8-
<add key="darc-pub-aspnet-AspNetCore-Tooling-2903677" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-Tooling-29036777/nuget/v3/index.json" />
9+
<add key="darc-pub-aspnet-AspNetCore-Tooling-2dab42e1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-tooling-2dab42e1/nuget/v3/index.json" />
910
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1011
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
1112
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<Uri>https://github.com/dotnet/core-setup</Uri>
66
<Sha>65f04fb6db7a5e198d05dbebd5c4ad21eb018f89</Sha>
77
</Dependency>
8+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.2-servicing.20067.4">
9+
<Uri>https://github.com/dotnet/core-setup</Uri>
10+
<Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
11+
</Dependency>
812
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.200-preview.20059.1">
913
<Uri>https://github.com/dotnet/cli</Uri>
1014
<Sha>cbf29e13514ba9d3be54eff7ccfe4b9df93e581b</Sha>
@@ -29,14 +33,14 @@
2933
<Uri>https://github.com/dotnet/roslyn</Uri>
3034
<Sha>d2bd58c62f9104d66f415141a1a27b665c78690c</Sha>
3135
</Dependency>
32-
<Dependency Name="Microsoft.NET.Sdk.Razor" Version="3.1.0">
33-
<Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
34-
<Sha>29036777e7cd2172a81c45c69e0dc257e8b8184e</Sha>
36+
<Dependency Name="Microsoft.NET.Sdk.Razor" Version="3.1.2">
37+
<Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
38+
<Sha>2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0</Sha>
3539
</Dependency>
3640
<!-- For coherency purposes, this version should be gated by the version of wpf routed via core setup -->
37-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="3.1.0-rtm.19565.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
38-
<Uri>https://github.com/dotnet/wpf</Uri>
39-
<Sha>427fa56aed34cbbc5096aa6137e748054905507d</Sha>
41+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="3.1.0-rtm.19605.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
42+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
43+
<Sha>a8e48616c8d8e56469a456eb1ee263268316b827</Sha>
4044
</Dependency>
4145
<Dependency Name="NuGet.Build.Tasks" Version="5.5.0-preview.2.6355">
4246
<Uri>https://github.com/NuGet/NuGet.Client</Uri>

‎eng/Versions.props‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</PropertyGroup>
3838
<PropertyGroup>
3939
<!-- Dependencies from https://github.com/aspnet/AspNetCore-Tooling -->
40-
<MicrosoftNETSdkRazorPackageVersion>3.1.0</MicrosoftNETSdkRazorPackageVersion>
40+
<MicrosoftNETSdkRazorPackageVersion>3.1.2</MicrosoftNETSdkRazorPackageVersion>
4141
</PropertyGroup>
4242
<PropertyGroup>
4343
<!-- Dependencies from https://github.com/aspnet/websdk -->
@@ -48,7 +48,7 @@
4848
</PropertyGroup>
4949
<PropertyGroup>
5050
<!-- Dependencies from https://devdiv.visualstudio.com/DevDiv/_git/DotNet-Trusted -->
51-
<MicrosoftNETSdkWindowsDesktopPackageVersion>3.1.0-rtm.19565.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
51+
<MicrosoftNETSdkWindowsDesktopPackageVersion>3.1.0-rtm.19605.7</MicrosoftNETSdkWindowsDesktopPackageVersion>
5252
</PropertyGroup>
5353
<PropertyGroup>
5454
<!-- Dependencies from https://github.com/nuget/nuget.client -->
@@ -78,7 +78,8 @@
7878
<PropertyGroup>
7979
<!-- Dependencies from https://github.com/dotnet/core-setup -->
8080
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
81-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.0</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
81+
<MicrosoftNETCoreAppInternalPackageVersion>3.1.2-servicing.20064.3</MicrosoftNETCoreAppInternalPackageVersion>
82+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
8283
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
8384
</PropertyGroup>
8485
<PropertyGroup>

‎eng/build.yml‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,32 +54,58 @@ jobs:
5454
/p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
5555
/p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
5656
/p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
57-
/p:PB_PublishType=$(_PublishType)
5857

5958
steps:
6059
- ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
60+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
61+
- task: PowerShell@2
62+
displayName: Setup Private Feeds Credentials
63+
inputs:
64+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
65+
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
66+
env:
67+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
6168
- script: build.cmd
6269
-pack -publish -ci -test
6370
-Configuration $(BuildConfig)
6471
-Architecture $(BuildArchitecture)
6572
$(_PublishArgs)
6673
$(_OfficialBuildIdArgs)
74+
$(_InternalRuntimeDownloadArgs)
6775
displayName: Build
6876

6977
- ${{ if eq(parameters.agentOs, 'Linux') }}:
78+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
79+
- task: Bash@3
80+
displayName: Setup Private Feeds Credentials
81+
inputs:
82+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
83+
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
84+
env:
85+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
7086
- script: ./build.sh
7187
--pack --publish --ci --test
7288
--configuration $(BuildConfig)
7389
$(DockerParameter)
7490
--architecture $(BuildArchitecture)
7591
$(LinuxPortable)
7692
$(RuntimeId)
93+
$(_InternalRuntimeDownloadArgs)
7794
displayName: Build
7895

7996
- ${{ if eq(parameters.agentOs, 'Darwin') }}:
97+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
98+
- task: Bash@3
99+
displayName: Setup Private Feeds Credentials
100+
inputs:
101+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
102+
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
103+
env:
104+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
80105
- script: ./build.sh
81106
--pack --publish --ci --test
82107
--configuration $(BuildConfig)
108+
$(_InternalRuntimeDownloadArgs)
83109
displayName: Build
84110

85111
- ${{ if and(eq(parameters.enablePublishBuildAssets, true), ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "3.1.100",
44
"runtimes": {
55
"dotnet": [
6-
"$(MicrosoftNETCoreAppRuntimePackageVersion)"
6+
"$(MicrosoftNETCoreAppInternalPackageVersion)"
77
]
88
}
99
},

0 commit comments

Comments
 (0)