Update dependencies from https://github.com/dotnet/arcade build 20201027.10 (#8986)
[master] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.1.0-beta-20519-02 to 1.1.0-beta-20526-01 (parent: Microsoft.DotNet.Arcade.Sdk)
This commit is contained in:
parent
0585bc66b2
commit
7d20c3c922
7 changed files with 55 additions and 10 deletions
|
@ -140,21 +140,21 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20526.10">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20527.10">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>c0f916d7f45834c080bf6cce60cf2bcfa00bc0a7</Sha>
|
<Sha>51f14c7da74e5c3d2ce0bab077461da399333896</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.20526.10">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.20527.10">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>c0f916d7f45834c080bf6cce60cf2bcfa00bc0a7</Sha>
|
<Sha>51f14c7da74e5c3d2ce0bab077461da399333896</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
|
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
|
||||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||||
<Sha>639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1</Sha>
|
<Sha>639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-20519-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-20526-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||||
<Uri>https://github.com/dotnet/sourcelink</Uri>
|
<Uri>https://github.com/dotnet/sourcelink</Uri>
|
||||||
<Sha>0decb380f1e0f8267259b5ae5d0d1e5102e380a1</Sha>
|
<Sha>67c1d9bced36779dbe8c11cf2d5afd13e7b06785</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="XliffTasks" Version="1.0.0-beta.20520.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
<Dependency Name="XliffTasks" Version="1.0.0-beta.20520.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||||
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.20526.10</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.20527.10</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||||
|
|
|
@ -106,6 +106,13 @@ while :; do
|
||||||
__UbuntuRepo="http://ftp.debian.org/debian/"
|
__UbuntuRepo="http://ftp.debian.org/debian/"
|
||||||
__CodeName=jessie
|
__CodeName=jessie
|
||||||
;;
|
;;
|
||||||
|
s390x)
|
||||||
|
__BuildArch=s390x
|
||||||
|
__UbuntuArch=s390x
|
||||||
|
__UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
|
||||||
|
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
|
||||||
|
unset __LLDB_Package
|
||||||
|
;;
|
||||||
x86)
|
x86)
|
||||||
__BuildArch=x86
|
__BuildArch=x86
|
||||||
__UbuntuArch=i386
|
__UbuntuArch=i386
|
||||||
|
|
11
eng/common/cross/s390x/sources.list.bionic
Normal file
11
eng/common/cross/s390x/sources.list.bionic
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe
|
||||||
|
deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe
|
||||||
|
|
||||||
|
deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe
|
||||||
|
deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe
|
||||||
|
|
||||||
|
deb http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted
|
||||||
|
deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted
|
||||||
|
|
||||||
|
deb http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse
|
||||||
|
deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse
|
|
@ -36,6 +36,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
|
||||||
if("$ENV{__DistroRid}" MATCHES "tizen.*")
|
if("$ENV{__DistroRid}" MATCHES "tizen.*")
|
||||||
set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
|
set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
|
||||||
endif()
|
endif()
|
||||||
|
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
|
||||||
|
set(CMAKE_SYSTEM_PROCESSOR s390x)
|
||||||
|
set(TOOLCHAIN "s390x-linux-gnu")
|
||||||
elseif(TARGET_ARCH_NAME STREQUAL "x86")
|
elseif(TARGET_ARCH_NAME STREQUAL "x86")
|
||||||
set(CMAKE_SYSTEM_PROCESSOR i686)
|
set(CMAKE_SYSTEM_PROCESSOR i686)
|
||||||
set(TOOLCHAIN "i686-linux-gnu")
|
set(TOOLCHAIN "i686-linux-gnu")
|
||||||
|
@ -46,7 +49,7 @@ elseif (ILLUMOS)
|
||||||
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
|
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
|
||||||
set(TOOLCHAIN "x86_64-illumos")
|
set(TOOLCHAIN "x86_64-illumos")
|
||||||
else()
|
else()
|
||||||
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, arm64 and x86 are supported!")
|
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, arm64, s390x and x86 are supported!")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(DEFINED ENV{TOOLCHAIN})
|
if(DEFINED ENV{TOOLCHAIN})
|
||||||
|
@ -171,7 +174,7 @@ endif()
|
||||||
|
|
||||||
# Specify compile options
|
# Specify compile options
|
||||||
|
|
||||||
if((TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$" AND NOT "$ENV{__DistroRid}" MATCHES "android.*") OR ILLUMOS)
|
if((TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|s390x)$" AND NOT "$ENV{__DistroRid}" MATCHES "android.*") OR ILLUMOS)
|
||||||
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
|
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
|
||||||
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
|
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
|
||||||
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})
|
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})
|
||||||
|
|
|
@ -65,6 +65,24 @@
|
||||||
</Crossgen2SingleThreadedWorkItem>
|
</Crossgen2SingleThreadedWorkItem>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<CrossgenSizeOnDiskWorkItem Include="@(SingleAssembly)" Condition="'$(Architecture)' == 'x64'">
|
||||||
|
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
|
||||||
|
<PreCommands>$(Python) pre.py crossgen --core-root $(CoreRoot) --single %(Identity) </PreCommands>
|
||||||
|
<Command>$(Python) test.py sod --scenario-name "Crossgen %(Identity) Size" --dirs ./crossgen/</Command>
|
||||||
|
<PostCommands>$(Python) post.py</PostCommands>
|
||||||
|
</CrossgenSizeOnDiskWorkItem>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<Crossgen2SizeOnDiskWorkItem Include="@(SingleAssembly)" Condition="'$(Architecture)' == 'x64'">
|
||||||
|
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
|
||||||
|
<PreCommands>$(Python) $(Crossgen2Directory)pre.py crossgen2 --core-root $(CoreRoot) --single %(Identity) </PreCommands>
|
||||||
|
<Command>$(Python) test.py sod --scenario-name "Crossgen2 %(Identity) Size" --dirs ./crossgen/</Command>
|
||||||
|
<PostCommands>$(Python) post.py</PostCommands>
|
||||||
|
</Crossgen2SizeOnDiskWorkItem>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- Enable crossgen tests on Windows x64 and Windows x86 -->
|
<!-- Enable crossgen tests on Windows x64 and Windows x86 -->
|
||||||
<HelixWorkItem Include="@(CrossgenWorkItem -> 'Crossgen %(Identity)')" Condition="'$(AGENT_OS)' == 'Windows_NT'">
|
<HelixWorkItem Include="@(CrossgenWorkItem -> 'Crossgen %(Identity)')" Condition="'$(AGENT_OS)' == 'Windows_NT'">
|
||||||
|
@ -82,5 +100,11 @@
|
||||||
<Command>$(Python) $(Crossgen2Directory)test.py crossgen2 --core-root $(CoreRoot) --composite $(Crossgen2Directory)framework-r2r.dll.rsp</Command>
|
<Command>$(Python) $(Crossgen2Directory)test.py crossgen2 --core-root $(CoreRoot) --composite $(Crossgen2Directory)framework-r2r.dll.rsp</Command>
|
||||||
<Timeout>1:00</Timeout>
|
<Timeout>1:00</Timeout>
|
||||||
</HelixWorkItem>
|
</HelixWorkItem>
|
||||||
|
<HelixWorkItem Include="@(CrossgenSizeOnDiskWorkItem -> 'Crossgen Size on Disk %(Identity)')" Condition="'$(Architecture)' == 'x64'">
|
||||||
|
<Timeout>4:00</Timeout>
|
||||||
|
</HelixWorkItem>
|
||||||
|
<HelixWorkItem Include="@(Crossgen2SizeOnDiskWorkItem -> 'Crossgen2 Size on Disk %(Identity)')" Condition="'$(Architecture)' == 'x64'">
|
||||||
|
<Timeout>4:00</Timeout>
|
||||||
|
</HelixWorkItem>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
|
@ -8,6 +8,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20526.10"
|
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20527.10"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue