Update dependencies from https://github.com/dotnet/arcade build 20220203.1 (#13172)
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.22080.1 -> To Version 7.0.0-beta.22103.1 Dependency coherency updates Microsoft.SourceLink.GitHub From Version 1.2.0-beta-22071-02 -> To Version 1.2.0-beta-22101-03 (parent: Microsoft.DotNet.Arcade.Sdk Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This commit is contained in:
parent
b34cf7138a
commit
670823d1ad
5 changed files with 14 additions and 13 deletions
|
@ -177,28 +177,28 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22080.1">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22103.1">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
|
<Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22080.1">
|
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22103.1">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
|
<Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</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.22080.1">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22103.1">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
|
<Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22070.2">
|
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22070.2">
|
||||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||||
<Sha>e756a6d20bf6cbcbe3a9cf2f95d3bf5c9fcc09d2</Sha>
|
<Sha>e756a6d20bf6cbcbe3a9cf2f95d3bf5c9fcc09d2</Sha>
|
||||||
<SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
|
<SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22071-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22101-03" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||||
<Uri>https://github.com/dotnet/sourcelink</Uri>
|
<Uri>https://github.com/dotnet/sourcelink</Uri>
|
||||||
<Sha>192fa29996b63bd32b0b112e7757e2ca1c2bfbbb</Sha>
|
<Sha>72ddf5cd5ab8301a41f9741210766eff56a06581</Sha>
|
||||||
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
|
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22079.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22079.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22080.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||||
|
|
|
@ -140,6 +140,7 @@ jobs:
|
||||||
|
|
||||||
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
|
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
|
||||||
- task: ComponentGovernanceComponentDetection@0
|
- task: ComponentGovernanceComponentDetection@0
|
||||||
|
continueOnError: true
|
||||||
|
|
||||||
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
|
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
|
||||||
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
||||||
|
|
|
@ -43,8 +43,8 @@ steps:
|
||||||
# In that case, add variables to allow the download of internal runtimes if the specified versions are not found
|
# In that case, add variables to allow the download of internal runtimes if the specified versions are not found
|
||||||
# in the default public locations.
|
# in the default public locations.
|
||||||
internalRuntimeDownloadArgs=
|
internalRuntimeDownloadArgs=
|
||||||
if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then
|
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
|
||||||
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) --runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)'
|
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
buildConfig=Release
|
buildConfig=Release
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
"cmake": "3.16.4"
|
"cmake": "3.16.4"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22080.1",
|
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22103.1",
|
||||||
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22080.1"
|
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22103.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue