Merge pull request #14 from lytico/lytico/gtksharp/merge/dotnet_main-…

…main_linux_210609 merge dotnet/main main_linux & enhance
lytico · Jun 9, 2021 · 0603f69 · 0603f69
2 parents 40fefe6 + 6f031c6
commit 0603f69
Show file tree

Hide file tree

Showing 797 changed files with 13,690 additions and 5,974 deletions.
diff --git a/.nuspec/Microsoft.Maui.Controls.Debug.targets b/.nuspec/Microsoft.Maui.Controls.Debug.targets
@@ -1,6 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<MauiKeepXamlResources>True</MauiKeepXamlResources>
+		<_MauiForceXamlCForDebug>True</_MauiForceXamlCForDebug>
 	</PropertyGroup>
 
 	<Import Project="$(MSBuildThisFileDirectory)Microsoft.Maui.Controls.targets" />

diff --git a/.nuspec/Microsoft.Maui.Controls.DefaultItems.props b/.nuspec/Microsoft.Maui.Controls.DefaultItems.props
@@ -1,11 +1,11 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup Condition="'$(EnableDefaultItems)'=='True' And '$(EnableDefaultXamlItems)'=='True' And '$(EnableDefaultEmbeddedResourceItems)'=='True'">
-    <EmbeddedResource Include="**\*.xaml" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" SubType="Designer" Generator="MSBuild:UpdateDesignTimeXaml" />
+    <MauiXaml Include="**\*.xaml" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(EnableDefaultItems)'=='True' And '$(EnableDefaultCssItems)'=='True' And '$(EnableDefaultEmbeddedResourceItems)'=='True'">
-    <EmbeddedResource Include="**\*.css" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+    <MauiCss Include="**\*.css" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
   </ItemGroup>
 
   <Import Project="Microsoft.Maui.Controls.SingleProject.props" />

diff --git a/.nuspec/Microsoft.Maui.Controls.DefaultItems.targets b/.nuspec/Microsoft.Maui.Controls.DefaultItems.targets
@@ -11,6 +11,7 @@
 		<Compile Update="**\*.xaml$(DefaultLanguageSourceExtension)" DependentUpon="%(Filename)" SubType="Code" />
 		<None Remove="**\*.xaml" Condition="'$(EnableDefaultNoneItems)'=='True'" />
 	</ItemGroup>
+
 	<ItemGroup Condition="'$(EnableDefaultItems)'=='True' And '$(EnableDefaultCssItems)'=='True' And '$(EnableDefaultEmbeddedResourceItems)'=='True'">
 		<None Remove="**\*.css" Condition="'$(EnableDefaultNoneItems)'=='True'" />
 	</ItemGroup>

diff --git a/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets b/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets
@@ -1,6 +1,6 @@
 <Project>
   <!-- Linux -->
-  <PropertyGroup Condition="$(MauiLinuxTargets.Contains($(TargetFramework))) == true ">
+  <PropertyGroup Condition="$(MauiGtkTargets.Contains($(TargetFramework))) == true ">
     <DefineConstants>$(DefineConstants);LINUX;GTK</DefineConstants>
   </PropertyGroup>
 
@@ -46,11 +46,11 @@
     <Compile Remove="**\*.uwp.cs" />
     <None Include="**\*.uwp.cs" />
   </ItemGroup>
-  <ItemGroup Condition="$(DefineConstants.Contains('LINUX')) != true ">
-    <Compile Remove="**\*.Linux.cs" />
-    <None Include="**\*.Linux.cs" />
-    <Compile Remove="**\Linux\*.cs" />
-    <None Include="**\Linux\*.cs" />
+  <ItemGroup Condition="$(DefineConstants.Contains('GTK')) != true ">
+    <Compile Remove="**\*.Gtk.cs" />
+    <None Include="**\*.Gtk.cs" />
+    <Compile Remove="**\Gtk\*.cs" />
+    <None Include="**\Gtk\*.cs" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Windows -->
@@ -106,6 +106,7 @@
     <PackageReference Include="Microsoft.ProjectReunion.Foundation" />
     <PackageReference Include="Microsoft.ProjectReunion.WinUI" />
     <PackageReference Include="Microsoft.Graphics.Win2D" />
+    <PackageReference Include="Microsoft.Maui.Graphics.Win2D.WinUI.Desktop" />
   </ItemGroup>
   <ItemGroup Condition="$(DefineConstants.Contains('GTK')) == true ">
     <PackageReference Include="GtkSharp" Version="3.24.24.34" />

diff --git a/.nuspec/Microsoft.Maui.Controls.props b/.nuspec/Microsoft.Maui.Controls.props
@@ -1,4 +1,3 @@
-
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
 	<!--
@@ -16,4 +15,12 @@
 		<_IsHotRestartDefined>$([System.Text.RegularExpressions.Regex]::IsMatch('$(DefineConstants.Trim())', '(^|;)HOTRESTART($|;)'))</_IsHotRestartDefined>
 		<DefineConstants Condition="!$(_IsHotRestartDefined) And '$(IsHotRestartBuild)' == 'true'">HOTRESTART;$(DefineConstants)</DefineConstants>
 	</PropertyGroup>
+
+  <ItemGroup>
+    <CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="GenKind" />
+    <CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="ManifestResourceName" />
+    <CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="TargetPath" />
+    <CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="ItemSpec" />
+  </ItemGroup>
+
 </Project>
diff --git a/.nuspec/Microsoft.Maui.Controls.targets b/.nuspec/Microsoft.Maui.Controls.targets
@@ -1,15 +1,11 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-	<UsingTask TaskName="Microsoft.Maui.Controls.Build.Tasks.XamlGTask" AssemblyFile="$(MSBuildThisFileDirectory)Microsoft.Maui.Controls.Build.Tasks.dll" />
-	<UsingTask TaskName="Microsoft.Maui.Controls.Build.Tasks.CssGTask" AssemblyFile="$(MSBuildThisFileDirectory)Microsoft.Maui.Controls.Build.Tasks.dll" />
 	<UsingTask TaskName="Microsoft.Maui.Controls.Build.Tasks.XamlCTask" AssemblyFile="$(MSBuildThisFileDirectory)Microsoft.Maui.Controls.Build.Tasks.dll" />
 
 	<PropertyGroup>
 		<SynthesizeLinkMetadata>true</SynthesizeLinkMetadata>
 		<EnableDefaultXamlItems Condition="'$(EnableDefaultXamlItems)'==''">True</EnableDefaultXamlItems>
-		<_DefaultXamlItemsEnabled>False</_DefaultXamlItemsEnabled>
 		<EnableDefaultCssItems Condition="'$(EnableDefaultCssItems)'==''">True</EnableDefaultCssItems>
-		<_DefaultCssItemsEnabled>False</_DefaultCssItemsEnabled>
 		<!-- The WINUI check for this only runs when there is an empty string so I just convert false to an empty string to fall in line with our other properties -->
 		<SkipMicrosoftUIXamlCheckTargetPlatformVersion Condition="'$(SkipMicrosoftUIXamlCheckTargetPlatformVersion)'==''">true</SkipMicrosoftUIXamlCheckTargetPlatformVersion>
 		<SkipMicrosoftUIXamlCheckTargetPlatformVersion Condition="'$(SkipMicrosoftUIXamlCheckTargetPlatformVersion)'=='false'"></SkipMicrosoftUIXamlCheckTargetPlatformVersion>
@@ -19,6 +15,8 @@
 
 	<ItemGroup>
 		<ProjectCapability Include="Maui" Condition="'$(_ExcludeMauiProjectCapability)' != 'true'" />
+		<AvailableItemName Include="MauiXaml" />
+		<AvailableItemName Include="MauiCss" />
 	</ItemGroup>
 
 	<!-- Check Tasks ABI and other validations -->
@@ -48,50 +46,64 @@
 			Text="Microsoft.Maui requires .NETFramework >= v4.6.1. You have '$(TargetFrameworkVersion)'" />
 	</Target>
 
-	<!-- XamlG -->
-	<Target
-		Name="UpdateDesignTimeXaml"
-		DependsOnTargets="XamlG"/>
 
-	<PropertyGroup>
-		<CoreCompileDependsOn>
-			XamlG;
-			$(CoreCompileDependsOn);
-		</CoreCompileDependsOn>
-	</PropertyGroup>
+  <!-- Inject MauiXaml and MauiCss as AdditionalFiles for partial type generation-->  
+  <Target Name="_MauiInjectXamlCssAdditionalFiles"
+          BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun" 
+          DependsOnTargets="$(CreateManifestResourceNamesDependsOn)">
+    <ItemGroup>
+      <_MauiXamlWithResourceNames Remove="@(_MauiXamlWithResourceNames)" />
+      <_MauiXamlWithTargetPath Remove="@(_MauiXamlWithTargetPath)" />
+      <_MauiCssWithResourceNames Remove="@(_MauiCssWithResourceNames)" />
+      <_MauiCssWithTargetPath Remove="@(_MauiCssWithTargetPath)" />
+    </ItemGroup>
+
+    <CreateCSharpManifestResourceName
+              ResourceFiles="@(MauiXaml)"
+              RootNamespace="$(RootNamespace)"
+              UseDependentUponConvention="$(EmbeddedResourceUseDependentUponConvention)">
+      <Output TaskParameter="ResourceFilesWithManifestResourceNames" ItemName="_MauiXamlWithResourceNames" />
+    </CreateCSharpManifestResourceName>
+
+    <CreateCSharpManifestResourceName
+              ResourceFiles="@(MauiCss)"
+              RootNamespace="$(RootNamespace)"
+              UseDependentUponConvention="$(EmbeddedResourceUseDependentUponConvention)">
+      <Output TaskParameter="ResourceFilesWithManifestResourceNames" ItemName="_MauiCssWithResourceNames" />
+    </CreateCSharpManifestResourceName>
+
+    <AssignTargetPath Files="@(_MauiXamlWithResourceNames)" RootFolder="$(MSBuildProjectDirectory)">
+      <Output TaskParameter="AssignedFiles" ItemName="_MauiXamlWithTargetPath" />
+    </AssignTargetPath>
+
+    <AssignTargetPath Files="@(_MauiCssWithResourceNames)" RootFolder="$(MSBuildProjectDirectory)">
+      <Output TaskParameter="AssignedFiles" ItemName="_MauiCssWithTargetPath" />
+    </AssignTargetPath>
+
+    <ItemGroup>
+      <AdditionalFiles Include="@(_MauiXamlWithTargetPath)" ManifestResourceName="%(ManifestResourceName)" TargetPath="%(TargetPath)" ItemSpec="%(OriginalItemSpec)" GenKind="Xaml"/>
+      <AdditionalFiles Include="@(_MauiCssWithTargetPath)" ManifestResourceName="%(ManifestResourceName)" TargetPath="%(TargetPath)" ItemSpec="%(OriginalItemSpec)" GenKind="Css"/>
+      <_MauiXamlWithResourceNames Remove="@(_MauiXamlWithResourceNames)" />
+      <_MauiXamlWithTargetPath Remove="@(_MauiXamlWithTargetPath)" />
+      <_MauiCssWithResourceNames Remove="@(_MauiCssWithResourceNames)" />
+      <_MauiCssWithTargetPath Remove="@(_MauiCssWithTargetPath)" />
+    </ItemGroup>
+  </Target>
 
-	<Target
-		Name="_FindXamlGFiles"
-		DependsOnTargets="PrepareResourceNames">
-		<ItemGroup>
-			<_XamlGInputs
-				Include="@(EmbeddedResource)"
-				Condition="'%(Extension)' == '.xaml' AND '$(DefaultLanguageSourceExtension)' == '.cs' AND '%(TargetPath)' != ''" />
-			<_XamlGOutputs
-				Include="@(_XamlGInputs->'$(IntermediateOutputPath)%(TargetPath).g.cs')" />
-		</ItemGroup>
-	</Target>
 
-	<Target
-		Name="XamlG"
-		BeforeTargets="BeforeCompile"
-		DependsOnTargets="_FindXamlGFiles; PrepareResourceNames; AfterResolveReferences"
-		Inputs="@(_XamlGInputs)"
-		Outputs="@(_XamlGOutputs)">
-		<PropertyGroup>
-			<ReferencedAssemblies>@(ReferencePath)</ReferencedAssemblies>
-		</PropertyGroup>
-		<XamlGTask
-			XamlFiles="@(_XamlGInputs)"
-			OutputFiles="@(_XamlGOutputs)"
-			Language="$(Language)"
-			References = "$(ReferencedAssemblies)"
-			AssemblyName="$(AssemblyName)" />
-		<ItemGroup>
-			<FileWrites Include="@(_XamlGOutputs)" />
-			<Compile Include="@(_XamlGOutputs)" />
-		</ItemGroup>
-	</Target>
+  <!-- re-add MauiXaml and MauiCss as EmbeddedResources -->
+  <PropertyGroup>
+    <PrepareResourcesDependsOn>
+      _MauiAddXamlEmbeddedResources;
+      $(PrepareResourcesDependsOn);
+    </PrepareResourcesDependsOn>
+  </PropertyGroup>
+  <Target Name="_MauiAddXamlEmbeddedResources">
+    <ItemGroup>
+      <EmbeddedResource Include="@(MauiXaml)" />
+      <EmbeddedResource Include="@(MauiCss)" />
+    </ItemGroup>
+  </Target>
 
 	<!-- XamlC -->
 	<PropertyGroup>
@@ -103,12 +115,12 @@
 
 	<Target Name="XamlC"
 		AfterTargets="AfterCompile"
-		DependsOnTargets="_FindXamlGFiles"
 		Inputs="$(IntermediateOutputPath)$(TargetFileName)"
 		Outputs="$(IntermediateOutputPath)XamlC.stamp"
-		Condition=" '$(DesignTimeBuild)' != 'True' AND '@(_XamlGInputs->Count())' != '0' ">
+		Condition=" '$(DesignTimeBuild)' != 'True' AND '@(MauiXaml)' != ''">
 	    <PropertyGroup>
 		<_MauiXamlCValidateOnly>$(MauiXamlCValidateOnly)</_MauiXamlCValidateOnly>
+		<_MauiXamlCValidateOnly Condition="'$(Configuration)' != 'Release' AND '$(_MauiForceXamlCForDebug)' != 'True'">True</_MauiXamlCValidateOnly>
 		<_MauiXamlCValidateOnly Condition="'$(BuildingForLiveUnitTesting)' == 'True' ">True</_MauiXamlCValidateOnly>
 	    </PropertyGroup>
 		<XamlCTask
@@ -124,33 +136,6 @@
 			<FileWrites Include="$(IntermediateOutputPath)XamlC.stamp" />
 		</ItemGroup>
 	</Target>
-
-	<!-- CssG -->
-	<PropertyGroup>
-		<CoreCompileDependsOn>
-			CssG;
-			$(CoreCompileDependsOn);
-		</CoreCompileDependsOn>
-	</PropertyGroup>
-
-	<Target Name="_FindCSSFiles" DependsOnTargets="PrepareResourceNames">
-		<ItemGroup>
- 			<_CSSInputs Include="@(EmbeddedResource)" Condition="'%(Extension)' == '.css' AND '$(DefaultLanguageSourceExtension)' == '.cs' AND '%(TargetPath)' != ''" />
- 			<_CSSOutputs Include="@(_CSSInputs->'$(IntermediateOutputPath)%(TargetPath).g.cs')" />
- 		</ItemGroup>
-	</Target>
-
-	<Target Name="CssG" BeforeTargets="BeforeCompile" DependsOnTargets="_FindCSSFiles" Inputs="@(_CSSInputs)" Outputs="@(_CSSOutputs)">
-		<CssGTask
-			CSSFiles="@(_CSSInputs)"
-			OutputFiles="@(_CSSOutputs)"
-			Language = "$(Language)"
-			AssemblyName = "$(AssemblyName)" />
-		<ItemGroup>
- 			<FileWrites Include="@(_CSSOutputs)" />
- 			<Compile Include="@(_CSSOutputs)" />
- 		</ItemGroup>
-	</Target>
 
  <!-- 
     Platform Specific Targets.

diff --git a/.nuspec/Microsoft.Maui.Core.targets b/.nuspec/Microsoft.Maui.Core.targets
@@ -13,6 +13,7 @@
     </ItemGroup>
     <ItemGroup Condition="$(OutputType) == 'WinExe'">
       <EmbeddedResource Remove="**\*.xaml"></EmbeddedResource>
+      <MauiXaml Remove="**\*.xaml"></MauiXaml>
       <Compile Remove="**\*.xaml"></Compile>
     </ItemGroup>
   </Target>