Update dependencies from https://github.com/dotnet/arcade build 20211028.3 (#12558)
[main] Update dependencies from dotnet/arcade
This commit is contained in:
parent
8282bd4fe5
commit
cd856cb922
7 changed files with 17 additions and 18 deletions
|
@ -172,19 +172,19 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21527.1">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21528.3">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
|
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.21527.1">
|
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.21528.3">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
|
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21527.1">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21528.3">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
|
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
|
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
|
||||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.21527.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.21528.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||||
|
|
|
@ -60,10 +60,6 @@ jobs:
|
||||||
- name: GuardianPackagesConfigFile
|
- name: GuardianPackagesConfigFile
|
||||||
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
|
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
|
||||||
pool:
|
pool:
|
||||||
# To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019.
|
|
||||||
${{ if eq(parameters.extractArchiveArtifacts, 'false') }}:
|
|
||||||
name: Hosted VS2017
|
|
||||||
${{ if ne(parameters.extractArchiveArtifacts, 'false') }}:
|
|
||||||
vmImage: windows-2019
|
vmImage: windows-2019
|
||||||
steps:
|
steps:
|
||||||
- checkout: self
|
- checkout: self
|
||||||
|
|
|
@ -4,7 +4,7 @@ parameters:
|
||||||
|
|
||||||
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
|
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
|
||||||
pool:
|
pool:
|
||||||
vmImage: vs2017-win2016
|
vmImage: 'windows-2019'
|
||||||
|
|
||||||
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
|
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
|
||||||
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
|
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
|
||||||
|
@ -12,6 +12,7 @@ parameters:
|
||||||
SourcesDirectory: $(Build.SourcesDirectory)
|
SourcesDirectory: $(Build.SourcesDirectory)
|
||||||
CreatePr: true
|
CreatePr: true
|
||||||
AutoCompletePr: false
|
AutoCompletePr: false
|
||||||
|
ReusePr: true
|
||||||
UseLfLineEndings: true
|
UseLfLineEndings: true
|
||||||
UseCheckedInLocProjectJson: false
|
UseCheckedInLocProjectJson: false
|
||||||
LanguageSet: VS_Main_Languages
|
LanguageSet: VS_Main_Languages
|
||||||
|
@ -64,6 +65,8 @@ jobs:
|
||||||
${{ if eq(parameters.CreatePr, true) }}:
|
${{ if eq(parameters.CreatePr, true) }}:
|
||||||
isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
|
isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
|
||||||
isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
|
isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
|
||||||
|
${{ if eq(parameters.RepoType, 'gitHub') }}:
|
||||||
|
isShouldReusePrSelected: ${{ parameters.ReusePr }}
|
||||||
packageSourceAuth: patAuth
|
packageSourceAuth: patAuth
|
||||||
patVariable: ${{ parameters.CeapexPat }}
|
patVariable: ${{ parameters.CeapexPat }}
|
||||||
${{ if eq(parameters.RepoType, 'gitHub') }}:
|
${{ if eq(parameters.RepoType, 'gitHub') }}:
|
||||||
|
|
|
@ -6,7 +6,7 @@ parameters:
|
||||||
preSteps: []
|
preSteps: []
|
||||||
binlogPath: artifacts/log/Debug/Build.binlog
|
binlogPath: artifacts/log/Debug/Build.binlog
|
||||||
pool:
|
pool:
|
||||||
vmImage: vs2017-win2016
|
vmImage: 'windows-2019'
|
||||||
condition: ''
|
condition: ''
|
||||||
dependsOn: ''
|
dependsOn: ''
|
||||||
|
|
||||||
|
|
|
@ -83,7 +83,7 @@ jobs:
|
||||||
- ${{ if eq(parameters.enableSourceBuild, true) }}:
|
- ${{ if eq(parameters.enableSourceBuild, true) }}:
|
||||||
- Source_Build_Complete
|
- Source_Build_Complete
|
||||||
pool:
|
pool:
|
||||||
vmImage: vs2017-win2016
|
vmImage: 'windows-2019'
|
||||||
runAsPublic: ${{ parameters.runAsPublic }}
|
runAsPublic: ${{ parameters.runAsPublic }}
|
||||||
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
|
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
|
||||||
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
|
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
|
||||||
|
@ -96,4 +96,4 @@ jobs:
|
||||||
dependsOn:
|
dependsOn:
|
||||||
- Asset_Registry_Publish
|
- Asset_Registry_Publish
|
||||||
pool:
|
pool:
|
||||||
vmImage: vs2017-win2016
|
vmImage: 'windows-2019'
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
"cmake": "3.16.4"
|
"cmake": "3.16.4"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21527.1",
|
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21528.3",
|
||||||
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21527.1"
|
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21528.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue