Update dependencies from https://github.com/dotnet/arcade build 20211108.5 (#12630)
[release/6.0.1xx] Update dependencies from dotnet/arcade
This commit is contained in:
parent
5a3e064b88
commit
3a49af8062
8 changed files with 14 additions and 36 deletions
22
NuGet.config
22
NuGet.config
|
@ -7,38 +7,16 @@
|
||||||
<clear />
|
<clear />
|
||||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||||
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
||||||
<add key="darc-pub-dotnet-aspnetcore-ae1a6cb-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-ae1a6cbe-1/nuget/v3/index.json" />
|
|
||||||
<add key="darc-pub-dotnet-aspnetcore-ae1a6cb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-ae1a6cbe/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-1ec2e17-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-1ec2e17f-4/nuget/v3/index.json" />
|
|
||||||
<add key="darc-pub-dotnet-emsdk-1ec2e17-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-1ec2e17f-3/nuget/v3/index.json" />
|
|
||||||
<add key="darc-pub-dotnet-emsdk-1ec2e17-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-1ec2e17f-2/nuget/v3/index.json" />
|
|
||||||
<add key="darc-pub-dotnet-emsdk-1ec2e17-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-1ec2e17f-1/nuget/v3/index.json" />
|
|
||||||
<add key="darc-pub-dotnet-emsdk-1ec2e17" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-1ec2e17f/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 -->
|
||||||
<add key="darc-pub-DotNet-msbuild-Trusted-c9eb9dd-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-c9eb9dd6-1/nuget/v3/index.json" />
|
|
||||||
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
||||||
<!-- Begin: Package sources from dotnet-runtime -->
|
<!-- Begin: Package sources from dotnet-runtime -->
|
||||||
<add key="darc-pub-dotnet-runtime-4822e3c-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-4822e3c3-5/nuget/v3/index.json" />
|
|
||||||
<add key="darc-pub-dotnet-runtime-4822e3c-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-4822e3c3-4/nuget/v3/index.json" />
|
|
||||||
<add key="darc-pub-dotnet-runtime-4822e3c-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-4822e3c3-2/nuget/v3/index.json" />
|
|
||||||
<add key="darc-pub-dotnet-runtime-4822e3c-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-4822e3c3-1/nuget/v3/index.json" />
|
|
||||||
<!-- End: Package sources from dotnet-runtime -->
|
<!-- End: Package sources from dotnet-runtime -->
|
||||||
<!-- Begin: Package sources from dotnet-templating -->
|
<!-- Begin: Package sources from dotnet-templating -->
|
||||||
<add key="darc-pub-dotnet-templating-7d94161-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7d941613-4/nuget/v3/index.json" />
|
|
||||||
<add key="darc-pub-dotnet-templating-7d94161-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7d941613-3/nuget/v3/index.json" />
|
|
||||||
<add key="darc-pub-dotnet-templating-7d94161-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7d941613-2/nuget/v3/index.json" />
|
|
||||||
<add key="darc-pub-dotnet-templating-7d94161-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7d941613-1/nuget/v3/index.json" />
|
|
||||||
<add key="darc-pub-dotnet-templating-7d94161" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7d941613/nuget/v3/index.json" />
|
|
||||||
<!-- End: Package sources from dotnet-templating -->
|
<!-- End: Package sources from dotnet-templating -->
|
||||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||||
<add key="darc-pub-dotnet-windowsdesktop-59fea7d-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-windowsdesktop-59fea7da-4/nuget/v3/index.json" />
|
|
||||||
<add key="darc-pub-dotnet-windowsdesktop-59fea7d-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-windowsdesktop-59fea7da-3/nuget/v3/index.json" />
|
|
||||||
<add key="darc-pub-dotnet-windowsdesktop-59fea7d-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-windowsdesktop-59fea7da-2/nuget/v3/index.json" />
|
|
||||||
<add key="darc-pub-dotnet-windowsdesktop-59fea7d-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-windowsdesktop-59fea7da-1/nuget/v3/index.json" />
|
|
||||||
<add key="darc-pub-dotnet-windowsdesktop-59fea7d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-windowsdesktop-59fea7da/nuget/v3/index.json" />
|
|
||||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||||
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
||||||
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
|
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
|
||||||
|
|
|
@ -197,19 +197,19 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21519.3">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21558.5">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>85f3aa16d8797b5020f1fda11df1a958feb5f8df</Sha>
|
<Sha>8ebefe290f57089d60100465111e78f223ee91db</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.21519.3">
|
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.21558.5">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>85f3aa16d8797b5020f1fda11df1a958feb5f8df</Sha>
|
<Sha>8ebefe290f57089d60100465111e78f223ee91db</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.21519.3">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21558.5">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>85f3aa16d8797b5020f1fda11df1a958feb5f8df</Sha>
|
<Sha>8ebefe290f57089d60100465111e78f223ee91db</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-alpha.1.21521.1">
|
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-alpha.1.21521.1">
|
||||||
<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.21519.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.21558.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||||
|
|
|
@ -62,7 +62,7 @@ jobs:
|
||||||
pool:
|
pool:
|
||||||
# To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019.
|
# To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019.
|
||||||
${{ if eq(parameters.extractArchiveArtifacts, 'false') }}:
|
${{ if eq(parameters.extractArchiveArtifacts, 'false') }}:
|
||||||
name: Hosted VS2017
|
vmImage: windows-2019
|
||||||
${{ if ne(parameters.extractArchiveArtifacts, 'false') }}:
|
${{ if ne(parameters.extractArchiveArtifacts, 'false') }}:
|
||||||
vmImage: windows-2019
|
vmImage: windows-2019
|
||||||
steps:
|
steps:
|
||||||
|
|
|
@ -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:
|
||||||
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": "6.0.0-beta.21519.3",
|
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21558.5",
|
||||||
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21519.3"
|
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21558.5"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue