зеркало из https://github.com/dotnet/winforms.git
[main] Update dependencies from dotnet/arcade (#12602)
[main] Update dependencies from dotnet/arcade
This commit is contained in:
dotnet-maestro[bot]
GitHub
Родитель
8cafe95740
Коммит
cb1e49fa76
|
|
@ -191,29 +191,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
|
|||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<!-- Arcade -->
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24605.1">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24606.6">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
|
||||
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24605.1">
|
||||
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24606.6">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
|
||||
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.24605.1">
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.24606.6">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
|
||||
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24605.1">
|
||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24606.6">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
|
||||
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24605.1">
|
||||
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24606.6">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
|
||||
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24605.1">
|
||||
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24606.6">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
|
||||
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
</Dependencies>
|
||||
|
|
|
|||
|
|
@ -56,9 +56,9 @@
|
|||
</PropertyGroup>
|
||||
<!-- Arcade -->
|
||||
<PropertyGroup>
|
||||
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.24605.1</MicrosoftDotNetGenFacadesPackageVersion>
|
||||
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24605.1</MicrosoftDotNetRemoteExecutorVersion>
|
||||
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.24605.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
|
||||
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.24606.6</MicrosoftDotNetGenFacadesPackageVersion>
|
||||
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24606.6</MicrosoftDotNetRemoteExecutorVersion>
|
||||
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.24606.6</MicrosoftDotNetXUnitExtensionsPackageVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
|
||||
</PropertyGroup>
|
||||
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ steps:
|
|||
|
||||
portableBuildArgs=
|
||||
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
|
||||
portableBuildArgs='/p:PortabelBuild=${{ parameters.platform.portableBuild }}'
|
||||
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
|
||||
fi
|
||||
|
||||
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
|
||||
|
|
|
|||
|
|
@ -73,8 +73,8 @@ __AlpinePackages+=" krb5-dev"
|
|||
__AlpinePackages+=" openssl-dev"
|
||||
__AlpinePackages+=" zlib-dev"
|
||||
|
||||
__FreeBSDBase="13.3-RELEASE"
|
||||
__FreeBSDPkg="1.17.0"
|
||||
__FreeBSDBase="13.4-RELEASE"
|
||||
__FreeBSDPkg="1.21.3"
|
||||
__FreeBSDABI="13"
|
||||
__FreeBSDPackages="libunwind"
|
||||
__FreeBSDPackages+=" icu"
|
||||
|
|
@ -371,7 +371,7 @@ while :; do
|
|||
;;
|
||||
freebsd14)
|
||||
__CodeName=freebsd
|
||||
__FreeBSDBase="14.0-RELEASE"
|
||||
__FreeBSDBase="14.2-RELEASE"
|
||||
__FreeBSDABI="14"
|
||||
__SkipUnmount=1
|
||||
;;
|
||||
|
|
@ -574,7 +574,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then
|
|||
curl -SL "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version
|
||||
fi
|
||||
echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > "${__RootfsDir}"/usr/local/etc/pkg.conf
|
||||
echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf
|
||||
echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf
|
||||
mkdir -p "$__RootfsDir"/tmp
|
||||
# get and build package manager
|
||||
if [[ "$__hasWget" == 1 ]]; then
|
||||
|
|
|
|||
10
global.json
10
global.json
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"tools": {
|
||||
"dotnet": "9.0.100",
|
||||
"dotnet": "10.0.100-alpha.1.24573.1",
|
||||
"runtimes": {
|
||||
"dotnet/x64": [
|
||||
"$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)"
|
||||
|
|
@ -11,12 +11,12 @@
|
|||
}
|
||||
},
|
||||
"sdk": {
|
||||
"version": "9.0.100"
|
||||
"version": "10.0.100-alpha.1.24573.1"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24605.1",
|
||||
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.24605.1",
|
||||
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24605.1",
|
||||
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24606.6",
|
||||
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.24606.6",
|
||||
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24606.6",
|
||||
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
|
||||
"Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.24605.9"
|
||||
},
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче