From 4ab5796b969f5907c3b3ac4a8f166b2bf3fadacd Mon Sep 17 00:00:00 2001 From: Andrii Kurdiumov Date: Tue, 15 Feb 2022 12:39:38 +0600 Subject: [PATCH] Improve Linux build (#5964) This is attempt to compile project on Linux. Not all things are rosy, and vcxproj are not compiling. - Add execute permissions for build.sh -Add dummy .sh files for downloading native tools Fix places where canse sensetivity hurt build --- build.sh | 0 eng/WpfArcadeSdk/Sdk/Sdk.props | 2 +- eng/WpfArcadeSdk/Sdk/Sdk.targets | 2 +- eng/common/native/install-dotnet-api-docs_net5.0.sh | 2 ++ eng/common/native/install-net-framework-48-ref-assemblies.sh | 2 ++ eng/common/native/install-strawberry-perl.sh | 2 ++ .../src/PresentationCore/ref/PresentationCore-ref.csproj | 2 +- .../PresentationFramework/ref/PresentationFramework-ref.csproj | 2 +- src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj | 2 +- .../src/System.Xaml/ref/System.Xaml-ref.csproj | 2 +- 10 files changed, 12 insertions(+), 6 deletions(-) mode change 100644 => 100755 build.sh create mode 100755 eng/common/native/install-dotnet-api-docs_net5.0.sh create mode 100755 eng/common/native/install-net-framework-48-ref-assemblies.sh create mode 100755 eng/common/native/install-strawberry-perl.sh diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 diff --git a/eng/WpfArcadeSdk/Sdk/Sdk.props b/eng/WpfArcadeSdk/Sdk/Sdk.props index b1855fe8f09..124954cbce9 100644 --- a/eng/WpfArcadeSdk/Sdk/Sdk.props +++ b/eng/WpfArcadeSdk/Sdk/Sdk.props @@ -5,7 +5,7 @@ - $([System.IO.Directory]::GetParent("$(MSBuildThisFileDirectory.TrimEnd('\'))"))\ + $([System.IO.Directory]::GetParent("$(MSBuildThisFileDirectory.TrimEnd('\').TrimEnd('/'))"))\ $(WpfArcadeSdkRoot)tools\ diff --git a/eng/WpfArcadeSdk/Sdk/Sdk.targets b/eng/WpfArcadeSdk/Sdk/Sdk.targets index db8530fd1d2..8ed9fd97ebf 100644 --- a/eng/WpfArcadeSdk/Sdk/Sdk.targets +++ b/eng/WpfArcadeSdk/Sdk/Sdk.targets @@ -23,7 +23,7 @@ - + diff --git a/eng/common/native/install-dotnet-api-docs_net5.0.sh b/eng/common/native/install-dotnet-api-docs_net5.0.sh new file mode 100755 index 00000000000..940406f15c1 --- /dev/null +++ b/eng/common/native/install-dotnet-api-docs_net5.0.sh @@ -0,0 +1,2 @@ +#!/bin/bash +# this file intentionally left empty to please build on Linux \ No newline at end of file diff --git a/eng/common/native/install-net-framework-48-ref-assemblies.sh b/eng/common/native/install-net-framework-48-ref-assemblies.sh new file mode 100755 index 00000000000..efcbbc27dbf --- /dev/null +++ b/eng/common/native/install-net-framework-48-ref-assemblies.sh @@ -0,0 +1,2 @@ +#!/bin/bash +# this file intentionally left empty to please build on Linux diff --git a/eng/common/native/install-strawberry-perl.sh b/eng/common/native/install-strawberry-perl.sh new file mode 100755 index 00000000000..efcbbc27dbf --- /dev/null +++ b/eng/common/native/install-strawberry-perl.sh @@ -0,0 +1,2 @@ +#!/bin/bash +# this file intentionally left empty to please build on Linux diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj index 34d8ee0e997..75d9e1c713d 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj @@ -1,4 +1,4 @@ - + PresentationCore PresentationCore-ref diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj index 7ea4a0f4f46..b7ea8c46323 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj @@ -1,4 +1,4 @@ - + PresentationFramework PresentationFramework-ref diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj index 56c5680684e..b515a7646e1 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj @@ -1,4 +1,4 @@ - + {9AC36357-34B7-40A1-95CA-FE9F46D089A7} System.Xaml diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj b/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj index dcfb28d9118..7498f329404 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj @@ -1,4 +1,4 @@ - + System.Xaml System.Xaml-ref