mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #14584 from dotnet/darc-main-49e1d943-388b-4f66-a3d6-048731180f97

Browse source 
[main] Update dependencies from dotnet/arcade
This commit is contained in:
Marc Paine 2022-09-27 09:54:24 -07:00 committed by GitHub
commit 9f870edb6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
eng/Version.Details.xml
View file

@ -193,18 +193,18 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22473.1"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22476.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ba4d2568dd2e3e7538feeaba60215f7bcb99e89c</Sha> <Sha>56800483b84c4934d0312a84978c2be0ebe27fa0</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.22473.1"> <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.22476.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ba4d2568dd2e3e7538feeaba60215f7bcb99e89c</Sha> <Sha>56800483b84c4934d0312a84978c2be0ebe27fa0</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22473.1"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22476.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ba4d2568dd2e3e7538feeaba60215f7bcb99e89c</Sha> <Sha>56800483b84c4934d0312a84978c2be0ebe27fa0</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22462.2"> <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22462.2">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>
@ -219,9 +219,9 @@
<Sha>f508517df0f80bddd924a809fba1c3571396f3d9</Sha> <Sha>f508517df0f80bddd924a809fba1c3571396f3d9</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-22472-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22475-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri> <Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>25eb369a3b05519745e69e58668f5489400afff8</Sha> <Sha>baeb9afdfe9778caab2c57dd5c9352c3cca68cc5</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" /> <SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22462.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22462.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

2
eng/Versions.props
View file

@ -26,7 +26,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade --> <!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.22473.1</MicrosoftDotNetBuildTasksInstallersPackageVersion> <MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.22476.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services --> <!-- Dependency from https://github.com/dotnet/arcade-services -->

2
eng/common/templates/job/execute-sdl.yml
View file

@ -34,7 +34,7 @@ jobs:
- job: Run_SDL - job: Run_SDL
dependsOn: ${{ parameters.dependsOn }} dependsOn: ${{ parameters.dependsOn }}
displayName: Run SDL tool displayName: Run SDL tool
condition: eq( ${{ parameters.enable }}, 'true') condition: and(succeededOrFailed(), eq( ${{ parameters.enable }}, 'true'))
variables: variables:
- group: DotNet-VSTS-Bot - group: DotNet-VSTS-Bot
- name: AzDOProjectName - name: AzDOProjectName

4
eng/common/templates/post-build/post-build.yml
View file

@ -98,7 +98,7 @@ stages:
jobs: jobs:
- job: - job:
displayName: NuGet Validation displayName: NuGet Validation
condition: eq( ${{ parameters.enableNugetValidation }}, 'true') condition: and(succeededOrFailed(), eq( ${{ parameters.enableNugetValidation }}, 'true'))
pool: pool:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
@ -282,4 +282,4 @@ stages:
-MaestroToken '$(MaestroApiAccessToken)' -MaestroToken '$(MaestroApiAccessToken)'
-WaitPublishingFinish true -WaitPublishingFinish true
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.21.0" "cmake": "3.21.0"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22473.1", "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22476.4",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22473.1" "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22476.4"
} }
} }