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

Merge pull request #15069 from dotnet/darc-release/7.0.2xx-034b41ac-ba0c-4f34-90d0-673fcb5a7051

Browse source 
[release/7.0.2xx] Update dependencies from dotnet/arcade
This commit is contained in:
v-wuzhai 2022-11-30 18:18:45 -08:00 • committed by GitHub
commit 3491c72a35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
eng/Version.Details.xml
View file

@ -188,18 +188,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22572.6">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22580.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>40307db5eec2e3bc2df44bacb8482969f20142e3</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22572.6">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22580.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>40307db5eec2e3bc2df44bacb8482969f20142e3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22572.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22580.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>40307db5eec2e3bc2df44bacb8482969f20142e3</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22531.3">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

2
eng/Versions.props
View file

@ -27,7 +27,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22580.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

6
eng/common/templates/steps/source-build.yml
View file

@ -63,6 +63,11 @@ steps:
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
fi
runtimeOsArgs=
if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then
runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
fi
publishArgs=
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
publishArgs='--publish'
@ -75,6 +80,7 @@ steps:
$internalRuntimeDownloadArgs \
$internalRestoreArgs \
$targetRidArgs \
$runtimeOsArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
/p:ArcadeBuildFromSource=true
displayName: Build

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22572.6",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22572.6"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22580.5",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22580.5"
}
}