diff --git a/MapControl.sln b/MapControl.sln index b573da99..f9916ad3 100644 --- a/MapControl.sln +++ b/MapControl.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29102.190 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MapControl", "MapControl", "{52AECE49-F314-4F76-98F2-FA800F07824B}" EndProject @@ -22,76 +22,132 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .editorconfig = .editorconfig EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUiApp", "SampleApps\WinUiApp\WinUiApp.csproj", "{D52D7ECE-9979-4287-9118-93DE23DD8F69}" -EndProject -Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "WinUiApp (Package)", "SampleApps\WinUiApp (Package)\WinUiApp (Package).wapproj", "{2DB6959F-1768-495C-8EED-4830EF185584}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUiApp", "SampleApps\WinUiApp\WinUiApp.csproj", "{579B29D7-91CA-44F3-A96D-5D9BC957BADA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|arm64 = Debug|arm64 Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|arm64 = Release|arm64 Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|Any CPU.ActiveCfg = Debug|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|Any CPU.Build.0 = Debug|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|Any CPU.Deploy.0 = Debug|x64 + {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|arm64.ActiveCfg = Debug|x64 + {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|arm64.Build.0 = Debug|x64 + {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|arm64.Deploy.0 = Debug|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|x64.ActiveCfg = Debug|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|x64.Build.0 = Debug|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|x64.Deploy.0 = Debug|x64 + {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|x86.ActiveCfg = Debug|x64 + {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|x86.Build.0 = Debug|x64 + {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|x86.Deploy.0 = Debug|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|Any CPU.ActiveCfg = Release|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|Any CPU.Build.0 = Release|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|Any CPU.Deploy.0 = Release|x64 + {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|arm64.ActiveCfg = Release|x64 + {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|arm64.Build.0 = Release|x64 + {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|arm64.Deploy.0 = Release|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|x64.ActiveCfg = Release|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|x64.Build.0 = Release|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|x64.Deploy.0 = Release|x64 + {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|x86.ActiveCfg = Release|x64 + {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|x86.Build.0 = Release|x64 + {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|x86.Deploy.0 = Release|x64 {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|arm64.ActiveCfg = Debug|Any CPU + {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|arm64.Build.0 = Debug|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|x64.ActiveCfg = Debug|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|x64.Build.0 = Debug|Any CPU + {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|x86.ActiveCfg = Debug|Any CPU + {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|x86.Build.0 = Debug|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|Any CPU.ActiveCfg = Release|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|Any CPU.Build.0 = Release|Any CPU + {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|arm64.ActiveCfg = Release|Any CPU + {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|arm64.Build.0 = Release|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|x64.ActiveCfg = Release|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|x64.Build.0 = Release|Any CPU + {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|x86.ActiveCfg = Release|Any CPU + {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|x86.Build.0 = Release|Any CPU {62F1726B-3144-49F4-8BCC-94160A3B2186}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {62F1726B-3144-49F4-8BCC-94160A3B2186}.Debug|Any CPU.Build.0 = Debug|Any CPU + {62F1726B-3144-49F4-8BCC-94160A3B2186}.Debug|arm64.ActiveCfg = Debug|Any CPU + {62F1726B-3144-49F4-8BCC-94160A3B2186}.Debug|arm64.Build.0 = Debug|Any CPU {62F1726B-3144-49F4-8BCC-94160A3B2186}.Debug|x64.ActiveCfg = Debug|Any CPU {62F1726B-3144-49F4-8BCC-94160A3B2186}.Debug|x64.Build.0 = Debug|Any CPU + {62F1726B-3144-49F4-8BCC-94160A3B2186}.Debug|x86.ActiveCfg = Debug|Any CPU + {62F1726B-3144-49F4-8BCC-94160A3B2186}.Debug|x86.Build.0 = Debug|Any CPU {62F1726B-3144-49F4-8BCC-94160A3B2186}.Release|Any CPU.ActiveCfg = Release|Any CPU {62F1726B-3144-49F4-8BCC-94160A3B2186}.Release|Any CPU.Build.0 = Release|Any CPU + {62F1726B-3144-49F4-8BCC-94160A3B2186}.Release|arm64.ActiveCfg = Release|Any CPU + {62F1726B-3144-49F4-8BCC-94160A3B2186}.Release|arm64.Build.0 = Release|Any CPU {62F1726B-3144-49F4-8BCC-94160A3B2186}.Release|x64.ActiveCfg = Release|Any CPU {62F1726B-3144-49F4-8BCC-94160A3B2186}.Release|x64.Build.0 = Release|Any CPU + {62F1726B-3144-49F4-8BCC-94160A3B2186}.Release|x86.ActiveCfg = Release|Any CPU + {62F1726B-3144-49F4-8BCC-94160A3B2186}.Release|x86.Build.0 = Release|Any CPU {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Debug|arm64.ActiveCfg = Debug|Any CPU + {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Debug|arm64.Build.0 = Debug|Any CPU {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Debug|x64.ActiveCfg = Debug|Any CPU {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Debug|x64.Build.0 = Debug|Any CPU + {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Debug|x86.ActiveCfg = Debug|Any CPU + {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Debug|x86.Build.0 = Debug|Any CPU {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Release|Any CPU.ActiveCfg = Release|Any CPU {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Release|Any CPU.Build.0 = Release|Any CPU + {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Release|arm64.ActiveCfg = Release|Any CPU + {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Release|arm64.Build.0 = Release|Any CPU {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Release|x64.ActiveCfg = Release|Any CPU {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Release|x64.Build.0 = Release|Any CPU + {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Release|x86.ActiveCfg = Release|Any CPU + {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Release|x86.Build.0 = Release|Any CPU {92894476-02E1-47CB-936E-4154023456F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {92894476-02E1-47CB-936E-4154023456F0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {92894476-02E1-47CB-936E-4154023456F0}.Debug|arm64.ActiveCfg = Debug|Any CPU + {92894476-02E1-47CB-936E-4154023456F0}.Debug|arm64.Build.0 = Debug|Any CPU {92894476-02E1-47CB-936E-4154023456F0}.Debug|x64.ActiveCfg = Debug|Any CPU {92894476-02E1-47CB-936E-4154023456F0}.Debug|x64.Build.0 = Debug|Any CPU + {92894476-02E1-47CB-936E-4154023456F0}.Debug|x86.ActiveCfg = Debug|Any CPU + {92894476-02E1-47CB-936E-4154023456F0}.Debug|x86.Build.0 = Debug|Any CPU {92894476-02E1-47CB-936E-4154023456F0}.Release|Any CPU.ActiveCfg = Release|Any CPU {92894476-02E1-47CB-936E-4154023456F0}.Release|Any CPU.Build.0 = Release|Any CPU + {92894476-02E1-47CB-936E-4154023456F0}.Release|arm64.ActiveCfg = Release|Any CPU + {92894476-02E1-47CB-936E-4154023456F0}.Release|arm64.Build.0 = Release|Any CPU {92894476-02E1-47CB-936E-4154023456F0}.Release|x64.ActiveCfg = Release|Any CPU {92894476-02E1-47CB-936E-4154023456F0}.Release|x64.Build.0 = Release|Any CPU - {D52D7ECE-9979-4287-9118-93DE23DD8F69}.Debug|Any CPU.ActiveCfg = Debug|x64 - {D52D7ECE-9979-4287-9118-93DE23DD8F69}.Debug|x64.ActiveCfg = Debug|x64 - {D52D7ECE-9979-4287-9118-93DE23DD8F69}.Debug|x64.Build.0 = Debug|x64 - {D52D7ECE-9979-4287-9118-93DE23DD8F69}.Release|Any CPU.ActiveCfg = Release|x64 - {D52D7ECE-9979-4287-9118-93DE23DD8F69}.Release|x64.ActiveCfg = Release|x64 - {D52D7ECE-9979-4287-9118-93DE23DD8F69}.Release|x64.Build.0 = Release|x64 - {2DB6959F-1768-495C-8EED-4830EF185584}.Debug|Any CPU.ActiveCfg = Debug|x64 - {2DB6959F-1768-495C-8EED-4830EF185584}.Debug|x64.ActiveCfg = Debug|x64 - {2DB6959F-1768-495C-8EED-4830EF185584}.Debug|x64.Build.0 = Debug|x64 - {2DB6959F-1768-495C-8EED-4830EF185584}.Debug|x64.Deploy.0 = Debug|x64 - {2DB6959F-1768-495C-8EED-4830EF185584}.Release|Any CPU.ActiveCfg = Release|x64 - {2DB6959F-1768-495C-8EED-4830EF185584}.Release|x64.ActiveCfg = Release|x64 - {2DB6959F-1768-495C-8EED-4830EF185584}.Release|x64.Build.0 = Release|x64 - {2DB6959F-1768-495C-8EED-4830EF185584}.Release|x64.Deploy.0 = Release|x64 + {92894476-02E1-47CB-936E-4154023456F0}.Release|x86.ActiveCfg = Release|Any CPU + {92894476-02E1-47CB-936E-4154023456F0}.Release|x86.Build.0 = Release|Any CPU + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|Any CPU.ActiveCfg = Debug|x64 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|Any CPU.Build.0 = Debug|x64 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|Any CPU.Deploy.0 = Debug|x64 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|arm64.ActiveCfg = Debug|arm64 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|arm64.Build.0 = Debug|arm64 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|arm64.Deploy.0 = Debug|arm64 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|x64.ActiveCfg = Debug|x64 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|x64.Build.0 = Debug|x64 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|x64.Deploy.0 = Debug|x64 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|x86.ActiveCfg = Debug|x86 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|x86.Build.0 = Debug|x86 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|x86.Deploy.0 = Debug|x86 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|Any CPU.ActiveCfg = Release|x64 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|Any CPU.Build.0 = Release|x64 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|Any CPU.Deploy.0 = Release|x64 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|arm64.ActiveCfg = Release|arm64 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|arm64.Build.0 = Release|arm64 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|arm64.Deploy.0 = Release|arm64 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|x64.ActiveCfg = Release|x64 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|x64.Build.0 = Release|x64 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|x64.Deploy.0 = Release|x64 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|x86.ActiveCfg = Release|x86 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|x86.Build.0 = Release|x86 + {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -102,8 +158,7 @@ Global {62F1726B-3144-49F4-8BCC-94160A3B2186} = {52AECE49-F314-4F76-98F2-FA800F07824B} {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC} {92894476-02E1-47CB-936E-4154023456F0} = {52AECE49-F314-4F76-98F2-FA800F07824B} - {D52D7ECE-9979-4287-9118-93DE23DD8F69} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC} - {2DB6959F-1768-495C-8EED-4830EF185584} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC} + {579B29D7-91CA-44F3-A96D-5D9BC957BADA} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {458346DD-B23F-4FDC-8F9D-A10F1882A4DB} diff --git a/MapControl/WinUI/MapControl.WinUI.csproj b/MapControl/WinUI/MapControl.WinUI.csproj index ef99ca42..7d71415d 100644 --- a/MapControl/WinUI/MapControl.WinUI.csproj +++ b/MapControl/WinUI/MapControl.WinUI.csproj @@ -1,11 +1,12 @@  - net5.0-windows10.0.19041 + net6.0-windows10.0.19041.0 10.0.17763.0 MapControl win10-x86;win10-x64;win10-arm64 true ..\..\MapControl.snk + true false XAML Map Control 6.1.0 @@ -38,8 +39,7 @@ - - - + + diff --git a/SampleApps/WinUiApp (Package)/WinUiApp (Package).wapproj b/SampleApps/WinUiApp (Package)/WinUiApp (Package).wapproj deleted file mode 100644 index 4fd03b63..00000000 --- a/SampleApps/WinUiApp (Package)/WinUiApp (Package).wapproj +++ /dev/null @@ -1,59 +0,0 @@ - - - - 15.0 - - - - Debug - x64 - - - Release - x64 - - - - $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\ - WinUiApp\ - - - - 2db6959f-1768-495c-8eed-4830ef185584 - 10.0.19041.0 - 10.0.17763.0 - net5.0-windows$(TargetPlatformVersion);$(AssetTargetFallback) - en-US - false - ..\WinUiApp\WinUiApp.csproj - - - - Designer - - - - - - - - - - - - - - True - Properties\PublishProfiles\win10-$(Platform).pubxml - - - - - build - - - build - - - - \ No newline at end of file diff --git a/SampleApps/WinUiApp (Package)/WinUiApp (Package).wapproj.user b/SampleApps/WinUiApp (Package)/WinUiApp (Package).wapproj.user deleted file mode 100644 index 77c565b6..00000000 --- a/SampleApps/WinUiApp (Package)/WinUiApp (Package).wapproj.user +++ /dev/null @@ -1,7 +0,0 @@ - - - - AppHostLocalDebugger - False - - \ No newline at end of file diff --git a/SampleApps/WinUiApp/App.xaml b/SampleApps/WinUiApp/App.xaml index a0f55bc0..2c38157e 100644 --- a/SampleApps/WinUiApp/App.xaml +++ b/SampleApps/WinUiApp/App.xaml @@ -1,8 +1,7 @@  + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> diff --git a/SampleApps/WinUiApp/App.xaml.cs b/SampleApps/WinUiApp/App.xaml.cs index d7aa88ac..c14b8b74 100644 --- a/SampleApps/WinUiApp/App.xaml.cs +++ b/SampleApps/WinUiApp/App.xaml.cs @@ -4,6 +4,8 @@ namespace SampleApplication { public partial class App : Application { + private Window window; + public App() { InitializeComponent(); @@ -14,7 +16,5 @@ namespace SampleApplication window = new MainWindow(); window.Activate(); } - - private Window window; } } diff --git a/SampleApps/WinUiApp (Package)/Images/LockScreenLogo.scale-200.png b/SampleApps/WinUiApp/Assets/LockScreenLogo.scale-200.png similarity index 100% rename from SampleApps/WinUiApp (Package)/Images/LockScreenLogo.scale-200.png rename to SampleApps/WinUiApp/Assets/LockScreenLogo.scale-200.png diff --git a/SampleApps/WinUiApp (Package)/Images/SplashScreen.scale-200.png b/SampleApps/WinUiApp/Assets/SplashScreen.scale-200.png similarity index 100% rename from SampleApps/WinUiApp (Package)/Images/SplashScreen.scale-200.png rename to SampleApps/WinUiApp/Assets/SplashScreen.scale-200.png diff --git a/SampleApps/WinUiApp (Package)/Images/Square150x150Logo.scale-200.png b/SampleApps/WinUiApp/Assets/Square150x150Logo.scale-200.png similarity index 100% rename from SampleApps/WinUiApp (Package)/Images/Square150x150Logo.scale-200.png rename to SampleApps/WinUiApp/Assets/Square150x150Logo.scale-200.png diff --git a/SampleApps/WinUiApp (Package)/Images/Square44x44Logo.scale-200.png b/SampleApps/WinUiApp/Assets/Square44x44Logo.scale-200.png similarity index 100% rename from SampleApps/WinUiApp (Package)/Images/Square44x44Logo.scale-200.png rename to SampleApps/WinUiApp/Assets/Square44x44Logo.scale-200.png diff --git a/SampleApps/WinUiApp (Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/SampleApps/WinUiApp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png similarity index 100% rename from SampleApps/WinUiApp (Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png rename to SampleApps/WinUiApp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png diff --git a/SampleApps/WinUiApp (Package)/Images/StoreLogo.png b/SampleApps/WinUiApp/Assets/StoreLogo.png similarity index 100% rename from SampleApps/WinUiApp (Package)/Images/StoreLogo.png rename to SampleApps/WinUiApp/Assets/StoreLogo.png diff --git a/SampleApps/WinUiApp (Package)/Images/Wide310x150Logo.scale-200.png b/SampleApps/WinUiApp/Assets/Wide310x150Logo.scale-200.png similarity index 100% rename from SampleApps/WinUiApp (Package)/Images/Wide310x150Logo.scale-200.png rename to SampleApps/WinUiApp/Assets/Wide310x150Logo.scale-200.png diff --git a/SampleApps/WinUiApp (Package)/Package.appxmanifest b/SampleApps/WinUiApp/Package.appxmanifest similarity index 72% rename from SampleApps/WinUiApp (Package)/Package.appxmanifest rename to SampleApps/WinUiApp/Package.appxmanifest index 7076af38..62c0d53f 100644 --- a/SampleApps/WinUiApp (Package)/Package.appxmanifest +++ b/SampleApps/WinUiApp/Package.appxmanifest @@ -7,14 +7,14 @@ IgnorableNamespaces="uap rescap"> - WinUiApp (Package) + WinUiApp Clemens - Images\StoreLogo.png + Assets\StoreLogo.png @@ -31,13 +31,13 @@ Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$"> - - + Square150x150Logo="Assets\Square150x150Logo.png" + Square44x44Logo="Assets\Square44x44Logo.png"> + + diff --git a/SampleApps/WinUiApp/Properties/PublishProfiles/win10-arm64.pubxml b/SampleApps/WinUiApp/Properties/PublishProfiles/win10-arm64.pubxml new file mode 100644 index 00000000..a132e44c --- /dev/null +++ b/SampleApps/WinUiApp/Properties/PublishProfiles/win10-arm64.pubxml @@ -0,0 +1,20 @@ + + + + + FileSystem + arm64 + win10-arm64 + bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ + true + False + False + True + + + \ No newline at end of file diff --git a/SampleApps/WinUiApp/Properties/PublishProfiles/win10-x64.pubxml b/SampleApps/WinUiApp/Properties/PublishProfiles/win10-x64.pubxml index 78bdd7d0..26ea7e55 100644 --- a/SampleApps/WinUiApp/Properties/PublishProfiles/win10-x64.pubxml +++ b/SampleApps/WinUiApp/Properties/PublishProfiles/win10-x64.pubxml @@ -10,7 +10,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ true False - True + False + True + + + FileSystem + x86 + win10-x86 + bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ + true + False + False + True + + + \ No newline at end of file diff --git a/SampleApps/WinUiApp/Properties/launchSettings.json b/SampleApps/WinUiApp/Properties/launchSettings.json new file mode 100644 index 00000000..9f1e0a36 --- /dev/null +++ b/SampleApps/WinUiApp/Properties/launchSettings.json @@ -0,0 +1,10 @@ +{ + "profiles": { + "WinUiApp (Package)": { + "commandName": "MsixPackage" + }, + "WinUiApp (Unpackaged)": { + "commandName": "Project" + } + } +} \ No newline at end of file diff --git a/SampleApps/WinUiApp/WinUiApp.csproj b/SampleApps/WinUiApp/WinUiApp.csproj index d25482c2..ca04eecf 100644 --- a/SampleApps/WinUiApp/WinUiApp.csproj +++ b/SampleApps/WinUiApp/WinUiApp.csproj @@ -1,12 +1,13 @@ - + WinExe - net5.0-windows10.0.19041 + net6.0-windows10.0.19041.0 10.0.17763.0 SampleApplication app.manifest - x64 - win10-x64 + x86;x64;arm64 + win10-x86;win10-x64;win10-arm64 + win10-$(Platform).pubxml true XAML Map Control 6.1.0 @@ -14,6 +15,7 @@ Clemens Fischer Copyright © 2021 Clemens Fischer none + true @@ -27,19 +29,32 @@ - + - + + + + + + + + - - - + + + + + + + diff --git a/SampleApps/WinUiApp/WinUiApp.csproj.user b/SampleApps/WinUiApp/WinUiApp.csproj.user deleted file mode 100644 index 75ea56df..00000000 --- a/SampleApps/WinUiApp/WinUiApp.csproj.user +++ /dev/null @@ -1,14 +0,0 @@ - - - - true - - - - Designer - - - Designer - - - \ No newline at end of file