未验证 提交 23740cfb 编写于 作者: D dotnet-maestro[bot] 提交者: GitHub

[main] Update dependencies from dotnet/arcade (#1708)

* Update dependencies from https://github.com/dotnet/arcade build 20211028.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21527.5 -> To Version 7.0.0-beta.21528.3

* Update dependencies from https://github.com/dotnet/arcade build 20211029.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21527.5 -> To Version 7.0.0-beta.21529.1
Co-authored-by: Ndotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
上级 0d68f522
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Dependencies> <Dependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21527.5"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21529.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>acde984116ccca032c345b782667a9a3ed9ba877</Sha> <Sha>0558f85d950fee2838bf02b9ba1f20d67f00b504</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21527.5"> <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21529.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>acde984116ccca032c345b782667a9a3ed9ba877</Sha> <Sha>0558f85d950fee2838bf02b9ba1f20d67f00b504</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.21527.5"> <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.21529.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>acde984116ccca032c345b782667a9a3ed9ba877</Sha> <Sha>0558f85d950fee2838bf02b9ba1f20d67f00b504</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
<!-- ProductDependencies --> <!-- ProductDependencies -->
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<!-- Disabling the check for End of live TFMs since we still target netcoreapp 2.1 --> <!-- Disabling the check for End of live TFMs since we still target netcoreapp 2.1 -->
<CheckEolTargetFramework>false</CheckEolTargetFramework> <CheckEolTargetFramework>false</CheckEolTargetFramework>
<PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel> <PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel>
<MicrosoftDotNetGenAPIPackageVersion>7.0.0-beta.21527.5</MicrosoftDotNetGenAPIPackageVersion> <MicrosoftDotNetGenAPIPackageVersion>7.0.0-beta.21529.1</MicrosoftDotNetGenAPIPackageVersion>
<!-- dotnet/corefx dependencies --> <!-- dotnet/corefx dependencies -->
<SystemDrawingCommonPackageVersion>5.0.3</SystemDrawingCommonPackageVersion> <SystemDrawingCommonPackageVersion>5.0.3</SystemDrawingCommonPackageVersion>
<SystemIOPortsPackageVersion>5.0.1</SystemIOPortsPackageVersion> <SystemIOPortsPackageVersion>5.0.1</SystemIOPortsPackageVersion>
......
...@@ -60,11 +60,7 @@ jobs: ...@@ -60,11 +60,7 @@ 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. vmImage: windows-2019
${{ if eq(parameters.extractArchiveArtifacts, 'false') }}:
name: Hosted VS2017
${{ if ne(parameters.extractArchiveArtifacts, 'false') }}:
vmImage: windows-2019
steps: steps:
- checkout: self - checkout: self
clean: true clean: true
......
...@@ -4,7 +4,7 @@ parameters: ...@@ -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)
......
...@@ -6,7 +6,7 @@ parameters: ...@@ -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: ...@@ -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: ...@@ -96,4 +96,4 @@ jobs:
dependsOn: dependsOn:
- Asset_Registry_Publish - Asset_Registry_Publish
pool: pool:
vmImage: vs2017-win2016 vmImage: 'windows-2019'
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
"version": "6.0.100-rc.1.21430.12" "version": "6.0.100-rc.1.21430.12"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21527.5", "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21529.1",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21527.5" "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21529.1"
} }
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册