Browse Source

Update dependencies from https://github.com/dotnet/arcade build 20210713.2 (#1115)

[main] Update dependencies from dotnet/arcade
philliphoff-multiplatform
dotnet-maestro[bot] 5 years ago
committed by GitHub
parent
commit
714ab9c931
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 20
      eng/Version.Details.xml
  2. 6
      eng/common/cross/build-rootfs.sh
  3. 2
      global.json

20
eng/Version.Details.xml

@ -3,25 +3,25 @@
<ProductDependencies> <ProductDependencies>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21359.3"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21363.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>55262f114b0c1b82f0b081bca0d919b657ba24c5</Sha> <Sha>1b053babb8a542e3ab20f93b3d0aedc732b7e0c7</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21359.3"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21363.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>55262f114b0c1b82f0b081bca0d919b657ba24c5</Sha> <Sha>1b053babb8a542e3ab20f93b3d0aedc732b7e0c7</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21359.3"> <Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21363.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>55262f114b0c1b82f0b081bca0d919b657ba24c5</Sha> <Sha>1b053babb8a542e3ab20f93b3d0aedc732b7e0c7</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21359.3"> <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21363.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>55262f114b0c1b82f0b081bca0d919b657ba24c5</Sha> <Sha>1b053babb8a542e3ab20f93b3d0aedc732b7e0c7</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.21359.3"> <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.21363.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>55262f114b0c1b82f0b081bca0d919b657ba24c5</Sha> <Sha>1b053babb8a542e3ab20f93b3d0aedc732b7e0c7</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4"> <Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>

6
eng/common/cross/build-rootfs.sh

@ -33,7 +33,6 @@ __AlpinePackages="alpine-base"
__AlpinePackages+=" build-base" __AlpinePackages+=" build-base"
__AlpinePackages+=" linux-headers" __AlpinePackages+=" linux-headers"
__AlpinePackagesEdgeCommunity=" lldb-dev" __AlpinePackagesEdgeCommunity=" lldb-dev"
__AlpinePackagesEdgeMain=" llvm10-libs"
__AlpinePackagesEdgeMain+=" python3" __AlpinePackagesEdgeMain+=" python3"
__AlpinePackagesEdgeMain+=" libedit" __AlpinePackagesEdgeMain+=" libedit"
@ -115,6 +114,8 @@ while :; do
__UbuntuArch=s390x __UbuntuArch=s390x
__UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/" __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//') __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp-dev//')
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//')
unset __LLDB_Package unset __LLDB_Package
;; ;;
x86) x86)
@ -191,6 +192,8 @@ while :; do
__CodeName=alpine __CodeName=alpine
__UbuntuRepo= __UbuntuRepo=
__AlpineVersion=3.9 __AlpineVersion=3.9
__AlpinePackagesEdgeMain+=" llvm11-libs"
__AlpinePackagesEdgeMain+=" clang-libs"
;; ;;
alpine3.13) alpine3.13)
__CodeName=alpine __CodeName=alpine
@ -201,6 +204,7 @@ while :; do
__AlpinePackagesEdgeCommunity= __AlpinePackagesEdgeCommunity=
__AlpinePackages+=$__AlpinePackagesEdgeMain __AlpinePackages+=$__AlpinePackagesEdgeMain
__AlpinePackagesEdgeMain= __AlpinePackagesEdgeMain=
__AlpinePackages+=" llvm10-libs"
;; ;;
freebsd11) freebsd11)
__FreeBSDBase="11.3-RELEASE" __FreeBSDBase="11.3-RELEASE"

2
global.json

@ -11,6 +11,6 @@
} }
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21359.3" "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21363.2"
} }
} }

Loading…
Cancel
Save