From 4045a73f20ee94466db79dc6cd0dd0771e7becba Mon Sep 17 00:00:00 2001 From: Yimeng Wu Date: Mon, 30 May 2022 01:00:26 +0800 Subject: [PATCH] Use Embedded C#/WinRT Support (#451) * Use Embedded C#/WinRT Support * Update build.yml --- .github/workflows/build.yml | 6 ++- Directory.Build.props | 8 +++ Directory.Build.targets | 39 -------------- ModernWpf.Controls/ModernWpf.Controls.csproj | 3 +- ModernWpf.Controls/ModernWpfUI.nuspec | 4 +- ModernWpf.MahApps/ModernWpf.MahApps.csproj | 2 +- .../ModernWpf.SampleApp.csproj | 3 +- ModernWpf.sln | 15 +++--- ModernWpf/ModernWpf.csproj | 51 +++++++++++++++++-- samples/MahAppsSample/MahAppsSample.csproj | 3 +- samples/SamplesCommon/SamplesCommon.csproj | 2 +- test/ModernWpfTestApp/ModernWpfTestApp.csproj | 1 - test/TestAppUtils/TestAppUtils.csproj | 1 - .../WinUIResourcesConverter.csproj | 1 - 14 files changed, 75 insertions(+), 64 deletions(-) create mode 100644 Directory.Build.props diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 20c71557..e20f46b7 100644 --- 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/setup-windows10-sdk-action@v1.5 - name: Install dependencies run: dotnet restore - name: Build diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 00000000..d5cc7dde --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,8 @@ + + + 0.9.4 + Yimeng Wu + ModernWPF UI Library + 9.0 + + \ No newline at end of file diff --git a/Directory.Build.targets b/Directory.Build.targets index cd66bc57..d11b4631 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,10 +1,4 @@  - - 0.9.4 - Yimeng Wu - ModernWPF UI Library - - MIT https://github.com/Kinnara/ModernWpf @@ -39,37 +33,4 @@ 7.0 - - - - - - - - - - - - - - - $(MSBuildThisFileDirectory)WinMD\Windows.WinMD - true - false - - - $(MSBuildThisFileDirectory)WinMD\Windows.Foundation.FoundationContract.winmd - true - false - - - $(MSBuildThisFileDirectory)WinMD\Windows.Foundation.UniversalApiContract.winmd - true - false - - - - - - \ No newline at end of file diff --git a/ModernWpf.Controls/ModernWpf.Controls.csproj b/ModernWpf.Controls/ModernWpf.Controls.csproj index 325ef230..904a64ab 100644 --- a/ModernWpf.Controls/ModernWpf.Controls.csproj +++ b/ModernWpf.Controls/ModernWpf.Controls.csproj @@ -1,13 +1,12 @@  - net45;net462;netcoreapp3.0;net5.0-windows10.0.18362.0 + net45;net462;netcoreapp3.0;net5.0-windows7.0 true en-US $(TargetsForTfmSpecificBuildOutput);GetDocumentationFile $(MSBuildThisFileDirectory)ModernWpfUI.nuspec ModernWpfUI - latest diff --git a/ModernWpf.Controls/ModernWpfUI.nuspec b/ModernWpf.Controls/ModernWpfUI.nuspec index caca35df..7e7b0613 100644 --- a/ModernWpf.Controls/ModernWpfUI.nuspec +++ b/ModernWpf.Controls/ModernWpfUI.nuspec @@ -23,13 +23,13 @@ - + - + diff --git a/ModernWpf.MahApps/ModernWpf.MahApps.csproj b/ModernWpf.MahApps/ModernWpf.MahApps.csproj index 701d8383..32c54683 100644 --- a/ModernWpf.MahApps/ModernWpf.MahApps.csproj +++ b/ModernWpf.MahApps/ModernWpf.MahApps.csproj @@ -1,7 +1,7 @@  - net452;net46;net462;net47;netcoreapp3.0;netcoreapp3.1;net5.0-windows10.0.18362.0 + net452;net46;net462;net47;netcoreapp3.0;netcoreapp3.1;net5.0-windows7.0 true en-US true diff --git a/ModernWpf.SampleApp/ModernWpf.SampleApp.csproj b/ModernWpf.SampleApp/ModernWpf.SampleApp.csproj index a045c197..01f55592 100644 --- a/ModernWpf.SampleApp/ModernWpf.SampleApp.csproj +++ b/ModernWpf.SampleApp/ModernWpf.SampleApp.csproj @@ -2,10 +2,9 @@ WinExe - net45;net48;netcoreapp3.1;net5.0-windows10.0.18362.0 + net45;net48;netcoreapp3.1;net5.0-windows true Assets\AppIcon.ico - latest diff --git a/ModernWpf.sln b/ModernWpf.sln index cc52b7e8..c4e976a5 100644 --- 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 index 757fb965..40a0bb5a 100644 --- a/ModernWpf/ModernWpf.csproj +++ b/ModernWpf/ModernWpf.csproj @@ -1,14 +1,59 @@  - net45;net462;netcoreapp3.0;net5.0-windows10.0.18362.0 + net45;net462;netcoreapp3.0;net5.0-windows7.0 true en-US true - latest - true + + true + 10.0.18362.0 + + 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; + + + Windows.Foundation.Diagnostics; + Windows.Foundation.PropertyType; + + + + + + + + + + + + + + + $(SolutionDir)WinMD\Windows.WinMD + true + false + + + $(SolutionDir)WinMD\Windows.Foundation.FoundationContract.winmd + true + false + + + $(SolutionDir)WinMD\Windows.Foundation.UniversalApiContract.winmd + true + false + + + diff --git a/samples/MahAppsSample/MahAppsSample.csproj b/samples/MahAppsSample/MahAppsSample.csproj index 22139b1d..49412a99 100644 --- a/samples/MahAppsSample/MahAppsSample.csproj +++ b/samples/MahAppsSample/MahAppsSample.csproj @@ -2,10 +2,9 @@ WinExe - net48;netcoreapp3.1;net5.0-windows10.0.18362.0 + net48;netcoreapp3.1;net5.0-windows true app.manifest - 8.0 diff --git a/samples/SamplesCommon/SamplesCommon.csproj b/samples/SamplesCommon/SamplesCommon.csproj index 0b9459b8..2e9ef24e 100644 --- a/samples/SamplesCommon/SamplesCommon.csproj +++ b/samples/SamplesCommon/SamplesCommon.csproj @@ -1,7 +1,7 @@  - net45;net462;netcoreapp3.1;net5.0-windows10.0.18362.0 + net45;net462;netcoreapp3.1;net5.0-windows true diff --git a/test/ModernWpfTestApp/ModernWpfTestApp.csproj b/test/ModernWpfTestApp/ModernWpfTestApp.csproj index 1a6a9a57..fc4e9fa7 100644 --- a/test/ModernWpfTestApp/ModernWpfTestApp.csproj +++ b/test/ModernWpfTestApp/ModernWpfTestApp.csproj @@ -6,7 +6,6 @@ true MUXControlsTestApp MUXControlsTestApp - 8.0 diff --git a/test/TestAppUtils/TestAppUtils.csproj b/test/TestAppUtils/TestAppUtils.csproj index 1c2265f6..37ffda53 100644 --- a/test/TestAppUtils/TestAppUtils.csproj +++ b/test/TestAppUtils/TestAppUtils.csproj @@ -3,7 +3,6 @@ net48 true - 8.0 System.Windows diff --git a/tools/WinUIResourcesConverter/WinUIResourcesConverter.csproj b/tools/WinUIResourcesConverter/WinUIResourcesConverter.csproj index 257a2f57..c78879b3 100644 --- a/tools/WinUIResourcesConverter/WinUIResourcesConverter.csproj +++ b/tools/WinUIResourcesConverter/WinUIResourcesConverter.csproj @@ -6,7 +6,6 @@ net48 true true - latest