Use Embedded C#/WinRT Support (#451)

* Use Embedded C#/WinRT Support * Update build.yml
Kinnara · May 29, 2022 · 4045a73 · 4045a73
1 parent 48167bf
commit 4045a73
Show file tree

Hide file tree

Showing 14 changed files with 75 additions and 64 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,11 +8,13 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v2
       with:
         dotnet-version: 6.0.x
+    - name: Setup Windows SDK
+      uses: GuillaumeFalourd/[email protected]
     - name: Install dependencies
       run: dotnet restore
     - name: Build

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,8 @@
+<Project>
+  <PropertyGroup>
+    <Version>0.9.4</Version>
+    <Authors>Yimeng Wu</Authors>
+    <Product>ModernWPF UI Library</Product>
+    <LangVersion>9.0</LangVersion>
+  </PropertyGroup>
+</Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,10 +1,4 @@
 <Project>
-  <PropertyGroup>
-    <Version>0.9.4</Version>
-    <Authors>Yimeng Wu</Authors>
-    <Product>ModernWPF UI Library</Product>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(PackageId)' != ''">
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/Kinnara/ModernWpf</PackageProjectUrl>
@@ -39,37 +33,4 @@
   <PropertyGroup Condition="'$(SupportedOSPlatform)' != '' and $([MSBuild]::VersionGreaterThan($(SupportedOSPlatform), '7.0'))">
     <SupportedOSPlatform>7.0</SupportedOSPlatform>
   </PropertyGroup>
-
-  <Choose>
-    <When Condition="'$(UseWinRT)' == 'true'">
-      <Choose>
-        <When Condition="$(DefineConstants.Contains('NET5_0_OR_NEWER'))" />
-        <When Condition="$(DefineConstants.Contains('NET461_OR_NEWER'))">
-          <ItemGroup>
-            <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.18362.2005" />
-          </ItemGroup>
-        </When>
-        <Otherwise>
-          <ItemGroup>
-            <PackageReference Include="System.Runtime.WindowsRuntime" Version="4.6.0" />
-            <Reference Include="Windows">
-              <HintPath>$(MSBuildThisFileDirectory)WinMD\Windows.WinMD</HintPath>
-              <IsWinMDFile>true</IsWinMDFile>
-              <Private>false</Private>
-            </Reference>
-            <Reference Include="Windows.Foundation.FoundationContract">
-              <HintPath>$(MSBuildThisFileDirectory)WinMD\Windows.Foundation.FoundationContract.winmd</HintPath>
-              <IsWinMDFile>true</IsWinMDFile>
-              <Private>false</Private>
-            </Reference>
-            <Reference Include="Windows.Foundation.UniversalApiContract">
-              <HintPath>$(MSBuildThisFileDirectory)WinMD\Windows.Foundation.UniversalApiContract.winmd</HintPath>
-              <IsWinMDFile>true</IsWinMDFile>
-              <Private>false</Private>
-            </Reference>
-          </ItemGroup>
-        </Otherwise>
-      </Choose>
-    </When>
-  </Choose>
 </Project>
diff --git a/ModernWpf.Controls/ModernWpf.Controls.csproj b/ModernWpf.Controls/ModernWpf.Controls.csproj
@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;net462;netcoreapp3.0;net5.0-windows10.0.18362.0</TargetFrameworks>
+    <TargetFrameworks>net45;net462;netcoreapp3.0;net5.0-windows7.0</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <NeutralLanguage>en-US</NeutralLanguage>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);GetDocumentationFile</TargetsForTfmSpecificBuildOutput>
     <NuspecFile>$(MSBuildThisFileDirectory)ModernWpfUI.nuspec</NuspecFile>
     <PackageId>ModernWpfUI</PackageId>
-    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/ModernWpf.Controls/ModernWpfUI.nuspec b/ModernWpf.Controls/ModernWpfUI.nuspec
@@ -23,13 +23,13 @@
       <group targetFramework="netcoreapp3.0">
         <dependency id="Microsoft.Windows.SDK.Contracts" version="10.0.18362.2005" exclude="Build,Analyzers" />
       </group>
-      <group targetFramework="net5.0-windows10.0.18362" />
+      <group targetFramework="net5.0-windows7.0" />
     </dependencies>
     <frameworkReferences>
       <group targetFramework="netcoreapp3.0">
         <frameworkReference name="Microsoft.WindowsDesktop.App.WPF" />
       </group>
-      <group targetFramework="net5.0-windows10.0.18362">
+      <group targetFramework="net5.0-windows7.0">
         <frameworkReference name="Microsoft.WindowsDesktop.App.WPF" />
       </group>
     </frameworkReferences>

diff --git a/ModernWpf.MahApps/ModernWpf.MahApps.csproj b/ModernWpf.MahApps/ModernWpf.MahApps.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>net452;net46;net462;net47;netcoreapp3.0;netcoreapp3.1;net5.0-windows10.0.18362.0</TargetFrameworks>
+    <TargetFrameworks>net452;net46;net462;net47;netcoreapp3.0;netcoreapp3.1;net5.0-windows7.0</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <NeutralLanguage>en-US</NeutralLanguage>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/ModernWpf.SampleApp/ModernWpf.SampleApp.csproj b/ModernWpf.SampleApp/ModernWpf.SampleApp.csproj
@@ -2,10 +2,9 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net45;net48;netcoreapp3.1;net5.0-windows10.0.18362.0</TargetFrameworks>
+    <TargetFrameworks>net45;net48;netcoreapp3.1;net5.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Assets\AppIcon.ico</ApplicationIcon>
-    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net45'">

diff --git a/ModernWpf.sln b/ModernWpf.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29215.179
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32519.379
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModernWpf.SampleApp", "ModernWpf.SampleApp\ModernWpf.SampleApp.csproj", "{4AB31DB2-4024-49E6-A522-F5418371A264}"
 EndProject
@@ -11,6 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModernWpf.Controls", "Moder
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1387DCAB-42A4-4F47-9E85-16998E2D9C71}"
 	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		Settings.XamlStyler = Settings.XamlStyler
 	EndProjectSection
@@ -45,13 +46,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiThreadingSample", "sam
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{07337569-6CA9-4BB0-9C8F-962D981CB5F4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUIResourcesConverter", "tools\WinUIResourcesConverter\WinUIResourcesConverter.csproj", "{35EF6F6B-3E8C-4A9E-BCD2-16CA5C2C2ADC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUIResourcesConverter", "tools\WinUIResourcesConverter\WinUIResourcesConverter.csproj", "{35EF6F6B-3E8C-4A9E-BCD2-16CA5C2C2ADC}"
 EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		test\NavigationView_TestUI\NavigationView_TestUI.projitems*{02ca89c3-68d7-4c80-9278-9a0f53fbe199}*SharedItemsImports = 13
-		test\NavigationView_TestUI\NavigationView_TestUI.projitems*{bb64399b-330b-45ba-be71-5ffa6ce841a8}*SharedItemsImports = 5
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|ARM = Debug|ARM
@@ -386,4 +383,8 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6251E140-0FAA-4DE9-B245-1C5BE188E578}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		test\NavigationView_TestUI\NavigationView_TestUI.projitems*{02ca89c3-68d7-4c80-9278-9a0f53fbe199}*SharedItemsImports = 13
+		test\NavigationView_TestUI\NavigationView_TestUI.projitems*{bb64399b-330b-45ba-be71-5ffa6ce841a8}*SharedItemsImports = 5
+	EndGlobalSection
 EndGlobal
diff --git a/ModernWpf/ModernWpf.csproj b/ModernWpf/ModernWpf.csproj
@@ -1,14 +1,59 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;net462;netcoreapp3.0;net5.0-windows10.0.18362.0</TargetFrameworks>
+    <TargetFrameworks>net45;net462;netcoreapp3.0;net5.0-windows7.0</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <NeutralLanguage>en-US</NeutralLanguage>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <LangVersion>latest</LangVersion>
-    <UseWinRT>true</UseWinRT>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <CsWinRTEmbedded>true</CsWinRTEmbedded>
+    <CsWinRTWindowsMetadata>10.0.18362.0</CsWinRTWindowsMetadata>
+    <CsWinRTIncludes>
+      Windows.Foundation;
+      Windows.UI.Color;
+      Windows.UI.IColors;
+      Windows.UI.ViewManagement.HandPreference;
+      Windows.UI.ViewManagement.IUISettings;
+      Windows.UI.ViewManagement.UIColorType;
+      Windows.UI.ViewManagement.UIElementType;
+      Windows.UI.ViewManagement.UISettings;
+    </CsWinRTIncludes>
+    <CsWinRTExcludes>
+      Windows.Foundation.Diagnostics;
+      Windows.Foundation.PropertyType;
+    </CsWinRTExcludes>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '5.0'))">
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.6.4" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '3.0')) and $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '5.0')) or
+                        '$(TargetFrameworkIdentifier)' == '.NETFramework' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '4.6.1'))">
+    <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.18362.2005" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '4.6.1'))">
+    <PackageReference Include="System.Runtime.WindowsRuntime" Version="4.6.0" />
+    <Reference Include="Windows">
+      <HintPath>$(SolutionDir)WinMD\Windows.WinMD</HintPath>
+      <IsWinMDFile>true</IsWinMDFile>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="Windows.Foundation.FoundationContract">
+      <HintPath>$(SolutionDir)WinMD\Windows.Foundation.FoundationContract.winmd</HintPath>
+      <IsWinMDFile>true</IsWinMDFile>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="Windows.Foundation.UniversalApiContract">
+      <HintPath>$(SolutionDir)WinMD\Windows.Foundation.UniversalApiContract.winmd</HintPath>
+      <IsWinMDFile>true</IsWinMDFile>
+      <Private>false</Private>
+    </Reference>
+  </ItemGroup>
+
   <ItemGroup Condition="!$(DefineConstants.Contains('NET47_OR_NEWER'))">
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>

diff --git a/samples/MahAppsSample/MahAppsSample.csproj b/samples/MahAppsSample/MahAppsSample.csproj
@@ -2,10 +2,9 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net48;netcoreapp3.1;net5.0-windows10.0.18362.0</TargetFrameworks>
+    <TargetFrameworks>net48;netcoreapp3.1;net5.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/SamplesCommon/SamplesCommon.csproj b/samples/SamplesCommon/SamplesCommon.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;net462;netcoreapp3.1;net5.0-windows10.0.18362.0</TargetFrameworks>
+    <TargetFrameworks>net45;net462;netcoreapp3.1;net5.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 

diff --git a/test/ModernWpfTestApp/ModernWpfTestApp.csproj b/test/ModernWpfTestApp/ModernWpfTestApp.csproj
@@ -6,7 +6,6 @@
     <UseWPF>true</UseWPF>
     <AssemblyName>MUXControlsTestApp</AssemblyName>
     <RootNamespace>MUXControlsTestApp</RootNamespace>
-    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/TestAppUtils/TestAppUtils.csproj b/test/TestAppUtils/TestAppUtils.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
     <UseWPF>true</UseWPF>
-    <LangVersion>8.0</LangVersion>
     <RootNamespace>System.Windows</RootNamespace>
   </PropertyGroup>
 

diff --git a/tools/WinUIResourcesConverter/WinUIResourcesConverter.csproj b/tools/WinUIResourcesConverter/WinUIResourcesConverter.csproj
@@ -6,7 +6,6 @@
     <TargetFramework>net48</TargetFramework>
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
-    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>