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
dotnet · Feb 15, 2022 · 4ab5796 · 4ab5796
1 parent 9789562
commit 4ab5796
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 6 deletions.
diff --git a/build.sh b/build.sh
diff --git a/eng/WpfArcadeSdk/Sdk/Sdk.props b/eng/WpfArcadeSdk/Sdk/Sdk.props
@@ -5,7 +5,7 @@
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
   <PropertyGroup>
-    <WpfArcadeSdkRoot>$([System.IO.Directory]::GetParent("$(MSBuildThisFileDirectory.TrimEnd('\'))"))\</WpfArcadeSdkRoot>
+    <WpfArcadeSdkRoot>$([System.IO.Directory]::GetParent("$(MSBuildThisFileDirectory.TrimEnd('\').TrimEnd('/'))"))\</WpfArcadeSdkRoot>
     <WpfArcadeSdkToolsDir>$(WpfArcadeSdkRoot)tools\</WpfArcadeSdkToolsDir>
   </PropertyGroup>
 

diff --git a/eng/WpfArcadeSdk/Sdk/Sdk.targets b/eng/WpfArcadeSdk/Sdk/Sdk.targets
@@ -23,7 +23,7 @@
   <Import Project="$(NoTargetsTargets)" Condition="'$(NoTargets)'=='true'"/>
   <Import Project="$(WpfArcadeSdkToolsDir)TestProjects.targets" />
   <Import Project="$(WpfArcadeSdkToolsDir)CreateTestPayload.targets" Condition="'$(CreateTestPayload)'=='true'"/>
-  <Import Project="$(WpfArcadeSdkToolsDir)GenAPI.targets"/>
+  <Import Project="$(WpfArcadeSdkToolsDir)GenApi.targets"/>
 
   <!-- PresentationBuildTasks related targets files -->
   <Import Project="$(WpfArcadeSdkToolsDir)Pbt.targets" Condition="'$(InternalMarkupCompilation)'=='true'"/>

diff --git a/eng/common/native/install-dotnet-api-docs_net5.0.sh 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
diff --git a/eng/common/native/install-net-framework-48-ref-assemblies.sh 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
@@ -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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.SDK">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>PresentationCore</AssemblyName>
     <PackageId>PresentationCore-ref</PackageId>

diff --git 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 @@
-<Project Sdk="Microsoft.NET.SDK">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>PresentationFramework</AssemblyName>
     <PackageId>PresentationFramework-ref</PackageId>

diff --git 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 @@
-<Project Sdk="Microsoft.NET.SDK">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectGuid>{9AC36357-34B7-40A1-95CA-FE9F46D089A7}</ProjectGuid>
     <AssemblyName>System.Xaml</AssemblyName>

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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.SDK">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>System.Xaml</AssemblyName>
     <PackageId>System.Xaml-ref</PackageId>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/bash
		# this file intentionally left empty to please build on Linux