Merge branch 'merge/release/6.0.1xx-to-release/6.0.3xx' of https://github.com/dotnet-maestro-bot/core-sdk into merge/release/6.0.1xx-to-release/6.0.3xx
This commit is contained in:
commit
fd7ea35f90
10 changed files with 28 additions and 27 deletions
14
.vsts-ci.yml
14
.vsts-ci.yml
|
@ -48,10 +48,10 @@ stages:
|
||||||
pool:
|
pool:
|
||||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||||
name: NetCore-Svc-Public
|
name: NetCore-Svc-Public
|
||||||
demands: ImageOverride -equals build.windows.10.amd64.vs2019.open
|
demands: ImageOverride -equals windows.vs2019.amd64.open
|
||||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||||
name: NetCore1ESPool-Svc-Internal
|
name: NetCore1ESPool-Svc-Internal
|
||||||
demands: ImageOverride -equals build.windows.10.amd64.vs2019
|
demands: ImageOverride -equals windows.vs2019.amd64
|
||||||
steps:
|
steps:
|
||||||
- publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
|
- publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
|
||||||
artifact: BuildConfiguration
|
artifact: BuildConfiguration
|
||||||
|
@ -62,10 +62,10 @@ stages:
|
||||||
pool:
|
pool:
|
||||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||||
name: NetCore-Svc-Public
|
name: NetCore-Svc-Public
|
||||||
demands: ImageOverride -equals build.windows.10.amd64.vs2019.open
|
demands: ImageOverride -equals windows.vs2019.amd64.open
|
||||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||||
name: NetCore1ESPool-Svc-Internal
|
name: NetCore1ESPool-Svc-Internal
|
||||||
demands: ImageOverride -equals build.windows.10.amd64.vs2019
|
demands: ImageOverride -equals windows.vs2019.amd64
|
||||||
timeoutInMinutes: 180
|
timeoutInMinutes: 180
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
|
@ -119,10 +119,10 @@ stages:
|
||||||
pool:
|
pool:
|
||||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||||
name: NetCore-Svc-Public
|
name: NetCore-Svc-Public
|
||||||
demands: ImageOverride -equals build.windows.10.amd64.vs2019.open
|
demands: ImageOverride -equals windows.vs2019.amd64.open
|
||||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||||
name: NetCore1ESPool-Svc-Internal
|
name: NetCore1ESPool-Svc-Internal
|
||||||
demands: ImageOverride -equals build.windows.10.amd64.vs2019
|
demands: ImageOverride -equals windows.vs2019.amd64
|
||||||
timeoutInMinutes: 180
|
timeoutInMinutes: 180
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
|
@ -406,7 +406,7 @@ stages:
|
||||||
pool:
|
pool:
|
||||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||||
name: NetCore1ESPool-Svc-Internal
|
name: NetCore1ESPool-Svc-Internal
|
||||||
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017
|
demands: ImageOverride -equals windows.vs2017.amd64
|
||||||
|
|
||||||
|
|
||||||
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
<add key="darc-int-dotnet-aspnetcore-3fe12b9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-3fe12b93/nuget/v3/index.json" />
|
<add key="darc-int-dotnet-aspnetcore-3fe12b9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-3fe12b93/nuget/v3/index.json" />
|
||||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||||
<!-- Begin: Package sources from dotnet-emsdk -->
|
<!-- Begin: Package sources from dotnet-emsdk -->
|
||||||
|
<add key="darc-pub-dotnet-emsdk-3f6c45a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2/nuget/v3/index.json" />
|
||||||
<!-- End: Package sources from dotnet-emsdk -->
|
<!-- End: Package sources from dotnet-emsdk -->
|
||||||
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
|
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
|
||||||
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
||||||
|
|
|
@ -168,7 +168,7 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.4">
|
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.4">
|
||||||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||||
<Sha>52e9452f82e26f9fcae791e84c082ae22f1ef66f</Sha>
|
<Sha>3f6c45a2580cd9387b643163de8136a9691764c8</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="0.1.0-alpha.1.21519.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="0.1.0-alpha.1.21519.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||||
<Uri>https://github.com/dotnet/source-build</Uri>
|
<Uri>https://github.com/dotnet/source-build</Uri>
|
||||||
|
@ -197,19 +197,19 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22412.2">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22463.7">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
|
<Sha>2fbe602d12256bf82de53791ddcbb964c1541b4e</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22412.2">
|
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22463.7">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
|
<Sha>2fbe602d12256bf82de53791ddcbb964c1541b4e</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22412.2">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22463.7">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
|
<Sha>2fbe602d12256bf82de53791ddcbb964c1541b4e</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22419.2">
|
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22419.2">
|
||||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.22412.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.22463.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||||
|
|
|
@ -53,7 +53,7 @@ jobs:
|
||||||
demands: Cmd
|
demands: Cmd
|
||||||
# If it's not devdiv, it's dnceng
|
# If it's not devdiv, it's dnceng
|
||||||
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
|
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
|
||||||
name: NetCore1ESPool-Internal
|
name: NetCore1ESPool-Svc-Internal
|
||||||
demands: ImageOverride -equals windows.vs2019.amd64
|
demands: ImageOverride -equals windows.vs2019.amd64
|
||||||
steps:
|
steps:
|
||||||
- checkout: self
|
- checkout: self
|
||||||
|
|
|
@ -40,7 +40,7 @@ jobs:
|
||||||
demands: Cmd
|
demands: Cmd
|
||||||
# If it's not devdiv, it's dnceng
|
# If it's not devdiv, it's dnceng
|
||||||
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
|
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
|
||||||
name: NetCore1ESPool-Internal
|
name: NetCore1ESPool-Svc-Internal
|
||||||
demands: ImageOverride -equals windows.vs2019.amd64
|
demands: ImageOverride -equals windows.vs2019.amd64
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
|
|
|
@ -46,10 +46,10 @@ jobs:
|
||||||
# source-build builds run in Docker, including the default managed platform.
|
# source-build builds run in Docker, including the default managed platform.
|
||||||
pool:
|
pool:
|
||||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||||
name: NetCore-Public
|
name: NetCore-Svc-Public
|
||||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
|
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
|
||||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||||
name: NetCore1ESPool-Internal
|
name: NetCore1ESPool-Svc-Internal
|
||||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||||
${{ if ne(parameters.platform.pool, '') }}:
|
${{ if ne(parameters.platform.pool, '') }}:
|
||||||
pool: ${{ parameters.platform.pool }}
|
pool: ${{ parameters.platform.pool }}
|
||||||
|
|
|
@ -89,7 +89,7 @@ jobs:
|
||||||
demands: Cmd
|
demands: Cmd
|
||||||
# If it's not devdiv, it's dnceng
|
# If it's not devdiv, it's dnceng
|
||||||
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
|
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
|
||||||
name: NetCore1ESPool-Internal
|
name: NetCore1ESPool-Svc-Internal
|
||||||
demands: ImageOverride -equals windows.vs2019.amd64
|
demands: ImageOverride -equals windows.vs2019.amd64
|
||||||
|
|
||||||
runAsPublic: ${{ parameters.runAsPublic }}
|
runAsPublic: ${{ parameters.runAsPublic }}
|
||||||
|
|
|
@ -100,7 +100,7 @@ stages:
|
||||||
demands: Cmd
|
demands: Cmd
|
||||||
# If it's not devdiv, it's dnceng
|
# If it's not devdiv, it's dnceng
|
||||||
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
|
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
|
||||||
name: NetCore1ESPool-Internal
|
name: NetCore1ESPool-Svc-Internal
|
||||||
demands: ImageOverride -equals windows.vs2019.amd64
|
demands: ImageOverride -equals windows.vs2019.amd64
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
@ -137,7 +137,7 @@ stages:
|
||||||
demands: Cmd
|
demands: Cmd
|
||||||
# If it's not devdiv, it's dnceng
|
# If it's not devdiv, it's dnceng
|
||||||
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
|
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
|
||||||
name: NetCore1ESPool-Internal
|
name: NetCore1ESPool-Svc-Internal
|
||||||
demands: ImageOverride -equals windows.vs2019.amd64
|
demands: ImageOverride -equals windows.vs2019.amd64
|
||||||
steps:
|
steps:
|
||||||
- template: setup-maestro-vars.yml
|
- template: setup-maestro-vars.yml
|
||||||
|
@ -197,7 +197,7 @@ stages:
|
||||||
demands: Cmd
|
demands: Cmd
|
||||||
# If it's not devdiv, it's dnceng
|
# If it's not devdiv, it's dnceng
|
||||||
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
|
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
|
||||||
name: NetCore1ESPool-Internal
|
name: NetCore1ESPool-Svc-Internal
|
||||||
demands: ImageOverride -equals windows.vs2019.amd64
|
demands: ImageOverride -equals windows.vs2019.amd64
|
||||||
steps:
|
steps:
|
||||||
- template: setup-maestro-vars.yml
|
- template: setup-maestro-vars.yml
|
||||||
|
@ -254,7 +254,7 @@ stages:
|
||||||
demands: Cmd
|
demands: Cmd
|
||||||
# If it's not devdiv, it's dnceng
|
# If it's not devdiv, it's dnceng
|
||||||
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
|
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
|
||||||
name: NetCore1ESPool-Internal
|
name: NetCore1ESPool-Svc-Internal
|
||||||
demands: ImageOverride -equals windows.vs2019.amd64
|
demands: ImageOverride -equals windows.vs2019.amd64
|
||||||
steps:
|
steps:
|
||||||
- template: setup-maestro-vars.yml
|
- template: setup-maestro-vars.yml
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"tools": {
|
"tools": {
|
||||||
"dotnet": "6.0.108",
|
"dotnet": "6.0.109",
|
||||||
"runtimes": {
|
"runtimes": {
|
||||||
"dotnet": [
|
"dotnet": [
|
||||||
"$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
|
"$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
|
||||||
|
@ -11,7 +11,7 @@
|
||||||
"cmake": "3.16.4"
|
"cmake": "3.16.4"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22412.2",
|
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22463.7",
|
||||||
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22412.2"
|
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22463.7"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue