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

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

Browse source 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This commit is contained in:
dotnet-maestro[bot] 2024-01-25 13:14:09 -08:00 committed by GitHub
parent 9c04f190f1
commit 8062881104
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
eng/Version.Details.xml
View file

@ -206,18 +206,18 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24074.1"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24075.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ac3bef13c5ab17858f69c12d015057a992f8da8a</Sha> <Sha>1d8f27f89c3b167f63e28e73a3d9ab345e81d310</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24074.1"> <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24075.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ac3bef13c5ab17858f69c12d015057a992f8da8a</Sha> <Sha>1d8f27f89c3b167f63e28e73a3d9ab345e81d310</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24074.1"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24075.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ac3bef13c5ab17858f69c12d015057a992f8da8a</Sha> <Sha>1d8f27f89c3b167f63e28e73a3d9ab345e81d310</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24074.1"> <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24074.1">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>
@ -227,9 +227,9 @@
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>70e9b79b12680b7be6c36913f1d0ecb5cc9e32cf</Sha> <Sha>70e9b79b12680b7be6c36913f1d0ecb5cc9e32cf</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24074.1"> <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24075.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ac3bef13c5ab17858f69c12d015057a992f8da8a</Sha> <Sha>1d8f27f89c3b167f63e28e73a3d9ab345e81d310</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13"> <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>

2
eng/Versions.props
View file

@ -40,7 +40,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade --> <!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24074.1</MicrosoftDotNetBuildTasksInstallersPackageVersion> <MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24075.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services --> <!-- Dependency from https://github.com/dotnet/arcade-services -->

1
eng/common/build.sh
View file

@ -240,6 +240,7 @@ function Build {
/p:Build=$build \ /p:Build=$build \
/p:DotNetBuildRepo=$product_build \ /p:DotNetBuildRepo=$product_build \
/p:ArcadeBuildFromSource=$source_build \ /p:ArcadeBuildFromSource=$source_build \
/p:DotNetBuildSourceOnly=$source_build \
/p:ArcadeBuildVertical=$vertical_build \ /p:ArcadeBuildVertical=$vertical_build \
/p:Rebuild=$rebuild \ /p:Rebuild=$rebuild \
/p:Test=$test \ /p:Test=$test \

2
eng/common/cross/build-rootfs.sh
View file

@ -72,7 +72,7 @@ __AlpinePackages+=" openssl-dev"
__AlpinePackages+=" zlib-dev" __AlpinePackages+=" zlib-dev"
__FreeBSDBase="13.2-RELEASE" __FreeBSDBase="13.2-RELEASE"
__FreeBSDPkg="1.20.0" __FreeBSDPkg="1.17.0"
__FreeBSDABI="13" __FreeBSDABI="13"
__FreeBSDPackages="libunwind" __FreeBSDPackages="libunwind"
__FreeBSDPackages+=" icu" __FreeBSDPackages+=" icu"

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

@ -94,6 +94,7 @@ steps:
$baseOsArgs \ $baseOsArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
/p:ArcadeBuildFromSource=true \ /p:ArcadeBuildFromSource=true \
/p:DotNetBuildSourceOnly=true \
/p:DotNetBuildRepo=true \ /p:DotNetBuildRepo=true \
/p:AssetManifestFileName=$assetManifestFileName /p:AssetManifestFileName=$assetManifestFileName
displayName: Build displayName: Build

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": "9.0.0-beta.24074.1", "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24075.2",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24074.1" "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24075.2"
} }
} }