tsai
/
tye
mirror of https://github.com/dotnet/tye.git
1
0
Fork 2
Code Issues Projects Releases Wiki Activity
Browse Source

Update dependencies from https://github.com/dotnet/arcade build 20231024.1 

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild
 From Version 8.0.0-beta.23265.1 -> To Version 9.0.0-beta.23524.1
pull/1598/head
dotnet-maestro[bot] 3 years ago
parent
d11b96ac06
commit
ec4a63c548
3 changed files with 16 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      eng/Version.Details.xml
  2. 10
      eng/common/cross/toolchain.cmake
  3. 2
      global.json

20
eng/Version.Details.xml
View File

@ -3,25 +3,25 @@
<ProductDependencies> <ProductDependencies>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23518.2"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23524.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha> <Sha>3b9d8a14dfad67dc3a5c18734db967d3ad173537</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.23518.2"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.23524.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha> <Sha>3b9d8a14dfad67dc3a5c18734db967d3ad173537</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.23518.2"> <Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.23524.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha> <Sha>3b9d8a14dfad67dc3a5c18734db967d3ad173537</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23518.2"> <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23524.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha> <Sha>3b9d8a14dfad67dc3a5c18734db967d3ad173537</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.23518.2"> <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.23524.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha> <Sha>3b9d8a14dfad67dc3a5c18734db967d3ad173537</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>

10
eng/common/cross/toolchain.cmake
View File

@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm")
set(TOOLCHAIN "arm-linux-gnueabihf") set(TOOLCHAIN "arm-linux-gnueabihf")
endif() endif()
if(TIZEN) if(TIZEN)
set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/13.1.0") set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0")
endif() endif()
elseif(TARGET_ARCH_NAME STREQUAL "arm64") elseif(TARGET_ARCH_NAME STREQUAL "arm64")
set(CMAKE_SYSTEM_PROCESSOR aarch64) set(CMAKE_SYSTEM_PROCESSOR aarch64)
@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
elseif(LINUX) elseif(LINUX)
set(TOOLCHAIN "aarch64-linux-gnu") set(TOOLCHAIN "aarch64-linux-gnu")
if(TIZEN) if(TIZEN)
set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/13.1.0") set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
endif() endif()
elseif(FREEBSD) elseif(FREEBSD)
set(triple "aarch64-unknown-freebsd12") set(triple "aarch64-unknown-freebsd12")
@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel")
set(CMAKE_SYSTEM_PROCESSOR armv7l) set(CMAKE_SYSTEM_PROCESSOR armv7l)
set(TOOLCHAIN "arm-linux-gnueabi") set(TOOLCHAIN "arm-linux-gnueabi")
if(TIZEN) if(TIZEN)
set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/13.1.0") set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0")
endif() endif()
elseif(TARGET_ARCH_NAME STREQUAL "armv6") elseif(TARGET_ARCH_NAME STREQUAL "armv6")
set(CMAKE_SYSTEM_PROCESSOR armv6l) set(CMAKE_SYSTEM_PROCESSOR armv6l)
@ -98,7 +98,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
elseif(LINUX) elseif(LINUX)
set(TOOLCHAIN "x86_64-linux-gnu") set(TOOLCHAIN "x86_64-linux-gnu")
if(TIZEN) if(TIZEN)
set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/13.1.0") set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0")
endif() endif()
elseif(FREEBSD) elseif(FREEBSD)
set(triple "x86_64-unknown-freebsd12") set(triple "x86_64-unknown-freebsd12")
@ -115,7 +115,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
set(TOOLCHAIN "i686-linux-gnu") set(TOOLCHAIN "i686-linux-gnu")
endif() endif()
if(TIZEN) if(TIZEN)
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/13.1.0") set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
endif() endif()
else() else()
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!") message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!")

2
global.json
View File

@ -14,6 +14,6 @@
} }
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23518.2" "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23524.1"
} }
} }

Write Preview
Loading…
Cancel
Save