From 194346b1b7bbf27e8323a707fb48df205af05057 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Mon, 29 Jul 2024 14:16:47 -0700 Subject: [PATCH 01/26] Add blank 'Microsoft.Xaml.Interactivity.Uwp.csproj' --- .../BehaviorsSDKManaged.sln | 50 ++++++++++++++----- .../Microsoft.Xaml.Interactivity.Uwp.csproj | 9 ++++ 2 files changed, 47 insertions(+), 12 deletions(-) create mode 100644 src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj diff --git a/src/BehaviorsSDKManaged/BehaviorsSDKManaged.sln b/src/BehaviorsSDKManaged/BehaviorsSDKManaged.sln index 54eb53c..c11dc48 100644 --- a/src/BehaviorsSDKManaged/BehaviorsSDKManaged.sln +++ b/src/BehaviorsSDKManaged/BehaviorsSDKManaged.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29806.167 +# Visual Studio Version 17 +VisualStudioVersion = 17.10.35027.167 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Xaml.Interactivity", "Microsoft.Xaml.Interactivity\Microsoft.Xaml.Interactivity.csproj", "{7FFC1385-C3E1-487C-9A81-DE48DD63ECB9}" EndProject @@ -36,9 +36,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Xaml.Interactivit EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WinUI", "WinUI", "{0A3F92B2-BCF6-4456-8C6B-76A7D85F2276}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Xaml.Interactions.WinUI", "Microsoft.Xaml.Interactions.WinUI\Microsoft.Xaml.Interactions.WinUI.csproj", "{53214A0E-68BB-4891-B3C4-55E0FA108661}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Xaml.Interactions.WinUI", "Microsoft.Xaml.Interactions.WinUI\Microsoft.Xaml.Interactions.WinUI.csproj", "{53214A0E-68BB-4891-B3C4-55E0FA108661}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Xaml.Interactivity.WinUI", "Microsoft.Xaml.Interactivity.WinUI\Microsoft.Xaml.Interactivity.WinUI.csproj", "{7119F232-7BEF-42F9-9BA1-52654ADC98B6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Xaml.Interactivity.WinUI", "Microsoft.Xaml.Interactivity.WinUI\Microsoft.Xaml.Interactivity.WinUI.csproj", "{7119F232-7BEF-42F9-9BA1-52654ADC98B6}" EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Xaml.Interactions.Shared", "Microsoft.Xaml.Interactions.Shared\Microsoft.Xaml.Interactions.Shared.shproj", "{0B356A23-7184-4E11-9706-2BF6A5FC82EB}" EndProject @@ -52,15 +52,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Legacy", "Legacy", "{67E69A EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{6DC88A28-BB73-411D-A94C-D1D2637289C8}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Uwp", "Uwp", "{67B23F04-942D-43D5-B501-8540BF0923B6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Xaml.Interactivity.Uwp", "Microsoft.Xaml.Interactivity.Uwp\Microsoft.Xaml.Interactivity.Uwp.csproj", "{E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}" +EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - Microsoft.Xaml.Interactions.Shared\Microsoft.Xaml.Interactions.Shared.projitems*{0b356a23-7184-4e11-9706-2bf6a5fc82eb}*SharedItemsImports = 13 - Microsoft.Xaml.Interactivity.Shared\Microsoft.Xaml.Interactivity.Shared.projitems*{52e3ed43-3013-4155-ad87-6df52a265d59}*SharedItemsImports = 13 - Microsoft.Xaml.Interactions.Shared\Microsoft.Xaml.Interactions.Shared.projitems*{53214a0e-68bb-4891-b3c4-55e0fa108661}*SharedItemsImports = 5 - Microsoft.Xaml.Interactivity.Shared\Microsoft.Xaml.Interactivity.Shared.projitems*{7119f232-7bef-42f9-9ba1-52654adc98b6}*SharedItemsImports = 5 - Microsoft.Xaml.Interactivity.Shared\Microsoft.Xaml.Interactivity.Shared.projitems*{7ffc1385-c3e1-487c-9a81-de48dd63ecb9}*SharedItemsImports = 4 - Microsoft.Xaml.Interactions.Shared\Microsoft.Xaml.Interactions.Shared.projitems*{a338a7f2-9010-477b-8a6e-6c2b2495c33c}*SharedItemsImports = 4 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|ARM64 = Debug|ARM64 @@ -215,6 +211,26 @@ Global {7119F232-7BEF-42F9-9BA1-52654ADC98B6}.Release|x64.Build.0 = Release|x64 {7119F232-7BEF-42F9-9BA1-52654ADC98B6}.Release|x86.ActiveCfg = Release|x86 {7119F232-7BEF-42F9-9BA1-52654ADC98B6}.Release|x86.Build.0 = Release|x86 + {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Debug|ARM.ActiveCfg = Debug|Any CPU + {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Debug|ARM.Build.0 = Debug|Any CPU + {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Debug|ARM64.Build.0 = Debug|Any CPU + {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Debug|x64.ActiveCfg = Debug|x64 + {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Debug|x64.Build.0 = Debug|x64 + {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Debug|x86.ActiveCfg = Debug|x86 + {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Debug|x86.Build.0 = Debug|x86 + {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Release|Any CPU.Build.0 = Release|Any CPU + {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Release|ARM.ActiveCfg = Release|Any CPU + {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Release|ARM.Build.0 = Release|Any CPU + {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Release|ARM64.ActiveCfg = Release|Any CPU + {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Release|ARM64.Build.0 = Release|Any CPU + {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Release|x64.ActiveCfg = Release|x64 + {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Release|x64.Build.0 = Release|x64 + {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Release|x86.ActiveCfg = Release|x86 + {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -231,8 +247,18 @@ Global {53214A0E-68BB-4891-B3C4-55E0FA108661} = {0A3F92B2-BCF6-4456-8C6B-76A7D85F2276} {7119F232-7BEF-42F9-9BA1-52654ADC98B6} = {0A3F92B2-BCF6-4456-8C6B-76A7D85F2276} {67E69A39-4F60-4F46-98D3-13C8DE05F0E4} = {6DC88A28-BB73-411D-A94C-D1D2637289C8} + {67B23F04-942D-43D5-B501-8540BF0923B6} = {6DC88A28-BB73-411D-A94C-D1D2637289C8} + {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD} = {67B23F04-942D-43D5-B501-8540BF0923B6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5590EAFF-6ECD-427C-A50A-A9ABFD9CDB2B} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + Microsoft.Xaml.Interactions.Shared\Microsoft.Xaml.Interactions.Shared.projitems*{0b356a23-7184-4e11-9706-2bf6a5fc82eb}*SharedItemsImports = 13 + Microsoft.Xaml.Interactivity.Shared\Microsoft.Xaml.Interactivity.Shared.projitems*{52e3ed43-3013-4155-ad87-6df52a265d59}*SharedItemsImports = 13 + Microsoft.Xaml.Interactions.Shared\Microsoft.Xaml.Interactions.Shared.projitems*{53214a0e-68bb-4891-b3c4-55e0fa108661}*SharedItemsImports = 5 + Microsoft.Xaml.Interactivity.Shared\Microsoft.Xaml.Interactivity.Shared.projitems*{7119f232-7bef-42f9-9ba1-52654adc98b6}*SharedItemsImports = 5 + Microsoft.Xaml.Interactivity.Shared\Microsoft.Xaml.Interactivity.Shared.projitems*{7ffc1385-c3e1-487c-9a81-de48dd63ecb9}*SharedItemsImports = 4 + Microsoft.Xaml.Interactions.Shared\Microsoft.Xaml.Interactions.Shared.projitems*{a338a7f2-9010-477b-8a6e-6c2b2495c33c}*SharedItemsImports = 4 + EndGlobalSection EndGlobal diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj new file mode 100644 index 0000000..fa71b7a --- /dev/null +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj @@ -0,0 +1,9 @@ + + + + net8.0 + enable + enable + + + From bd43ce02a8f9b6b2f6392b833055bed1eddb3360 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Mon, 29 Jul 2024 14:18:40 -0700 Subject: [PATCH 02/26] Add blank 'Microsoft.Xaml.Interactions.Uwp.csproj' --- .../BehaviorsSDKManaged.sln | 25 ++++++++++++++++++- .../Microsoft.Xaml.Interactions.Uwp.csproj | 9 +++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj diff --git a/src/BehaviorsSDKManaged/BehaviorsSDKManaged.sln b/src/BehaviorsSDKManaged/BehaviorsSDKManaged.sln index c11dc48..2a4940e 100644 --- a/src/BehaviorsSDKManaged/BehaviorsSDKManaged.sln +++ b/src/BehaviorsSDKManaged/BehaviorsSDKManaged.sln @@ -54,7 +54,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Uwp", "Uwp", "{67B23F04-942D-43D5-B501-8540BF0923B6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Xaml.Interactivity.Uwp", "Microsoft.Xaml.Interactivity.Uwp\Microsoft.Xaml.Interactivity.Uwp.csproj", "{E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Xaml.Interactivity.Uwp", "Microsoft.Xaml.Interactivity.Uwp\Microsoft.Xaml.Interactivity.Uwp.csproj", "{E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Xaml.Interactions.Uwp", "Microsoft.Xaml.Interactions.Uwp\Microsoft.Xaml.Interactions.Uwp.csproj", "{B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -231,6 +233,26 @@ Global {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Release|x64.Build.0 = Release|x64 {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Release|x86.ActiveCfg = Release|x86 {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}.Release|x86.Build.0 = Release|x86 + {B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}.Debug|ARM.ActiveCfg = Debug|Any CPU + {B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}.Debug|ARM.Build.0 = Debug|Any CPU + {B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}.Debug|ARM64.Build.0 = Debug|Any CPU + {B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}.Debug|x64.ActiveCfg = Debug|x64 + {B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}.Debug|x64.Build.0 = Debug|x64 + {B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}.Debug|x86.ActiveCfg = Debug|x86 + {B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}.Debug|x86.Build.0 = Debug|x86 + {B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}.Release|Any CPU.Build.0 = Release|Any CPU + {B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}.Release|ARM.ActiveCfg = Release|Any CPU + {B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}.Release|ARM.Build.0 = Release|Any CPU + {B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}.Release|ARM64.ActiveCfg = Release|Any CPU + {B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}.Release|ARM64.Build.0 = Release|Any CPU + {B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}.Release|x64.ActiveCfg = Release|x64 + {B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}.Release|x64.Build.0 = Release|x64 + {B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}.Release|x86.ActiveCfg = Release|x86 + {B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -249,6 +271,7 @@ Global {67E69A39-4F60-4F46-98D3-13C8DE05F0E4} = {6DC88A28-BB73-411D-A94C-D1D2637289C8} {67B23F04-942D-43D5-B501-8540BF0923B6} = {6DC88A28-BB73-411D-A94C-D1D2637289C8} {E6A328C8-2D9A-459A-86EE-F1C50CC6DADD} = {67B23F04-942D-43D5-B501-8540BF0923B6} + {B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3} = {67B23F04-942D-43D5-B501-8540BF0923B6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5590EAFF-6ECD-427C-A50A-A9ABFD9CDB2B} diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj new file mode 100644 index 0000000..fa71b7a --- /dev/null +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj @@ -0,0 +1,9 @@ + + + + net8.0 + enable + enable + + + From 498b8cb5400787eab08ac1fdef340036e2935a91 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Mon, 29 Jul 2024 14:25:22 -0700 Subject: [PATCH 03/26] Update .csproj for 'Microsoft.Xaml.Interactivity.Uwp' --- .../BehaviorsSDKManaged.sln | 3 +- .../Microsoft.Xaml.Interactivity.Uwp.csproj | 203 +++++++++++++++++- 2 files changed, 199 insertions(+), 7 deletions(-) diff --git a/src/BehaviorsSDKManaged/BehaviorsSDKManaged.sln b/src/BehaviorsSDKManaged/BehaviorsSDKManaged.sln index 2a4940e..223128a 100644 --- a/src/BehaviorsSDKManaged/BehaviorsSDKManaged.sln +++ b/src/BehaviorsSDKManaged/BehaviorsSDKManaged.sln @@ -56,7 +56,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Uwp", "Uwp", "{67B23F04-942 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Xaml.Interactivity.Uwp", "Microsoft.Xaml.Interactivity.Uwp\Microsoft.Xaml.Interactivity.Uwp.csproj", "{E6A328C8-2D9A-459A-86EE-F1C50CC6DADD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Xaml.Interactions.Uwp", "Microsoft.Xaml.Interactions.Uwp\Microsoft.Xaml.Interactions.Uwp.csproj", "{B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Xaml.Interactions.Uwp", "Microsoft.Xaml.Interactions.Uwp\Microsoft.Xaml.Interactions.Uwp.csproj", "{B1C5E139-C8DF-46B5-9ABC-4515BDECAFA3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -283,5 +283,6 @@ Global Microsoft.Xaml.Interactivity.Shared\Microsoft.Xaml.Interactivity.Shared.projitems*{7119f232-7bef-42f9-9ba1-52654adc98b6}*SharedItemsImports = 5 Microsoft.Xaml.Interactivity.Shared\Microsoft.Xaml.Interactivity.Shared.projitems*{7ffc1385-c3e1-487c-9a81-de48dd63ecb9}*SharedItemsImports = 4 Microsoft.Xaml.Interactions.Shared\Microsoft.Xaml.Interactions.Shared.projitems*{a338a7f2-9010-477b-8a6e-6c2b2495c33c}*SharedItemsImports = 4 + Microsoft.Xaml.Interactivity.Shared\Microsoft.Xaml.Interactivity.Shared.projitems*{e6a328c8-2d9a-459a-86ee-f1c50cc6dadd}*SharedItemsImports = 5 EndGlobalSection EndGlobal diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj index fa71b7a..afc2659 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj @@ -1,9 +1,200 @@  - - net8.0 - enable - enable + Library + net8.0-windows10.0.17763.0 + 10.0.17763.0 + 10.0.17763.37-preview + true + true + Microsoft.Xaml.Interactivity + AnyCPU;x86;x64;arm64 + win-x86;win-x64;win-arm64 + 10.0.17763.0 + $(TargetPlatformMinVersion) + false + true - - + + ..\..\..\out\Uwp\$(SolutionName)\bin\$(Platform)\$(Configuration)\ + ..\..\..\out\Uwp\$(SolutionName)\obj\$(Platform)\$(Configuration)\ + + + AnyCPU + true + full + false + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + prompt + 4 + + + AnyCPU + pdbonly + true + TRACE;NETFX_CORE;WINDOWS_UWP + prompt + 4 + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\AnyCPU\Release\Microsoft.Xaml.Interactivity.xml + + + x86 + true + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + x86 + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x86\Release\Microsoft.Xaml.Interactivity.xml + + + ARM + true + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + ARM + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\ARM\Release\Microsoft.Xaml.Interactivity.xml + + + ARM64 + true + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + ARM64 + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\ARM64\Release\Microsoft.Xaml.Interactivity.xml + + + x64 + true + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + x64 + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x64\Release\Microsoft.Xaml.Interactivity.xml + + + PackageReference + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + Resources\de-DE\Strings.resw + + + + + Resources\en-us\Strings.resw + + + + + Resources\es-ES\Strings.resw + + + + + Resources\fr-FR\Strings.resw + + + + + Resources\it-IT\Strings.resw + + + + + Resources\ja-JP\Strings.resw + + + + + Resources\ko-KR\Strings.resw + + + + + Resources\pt-BR\Strings.resw + + + + + Resources\ru-RU\Strings.resw + + + + + Resources\uk-UA\Strings.resw + + + + + Resources\zh-CN\Strings.resw + + + + + Resources\zh-TW\Strings.resw + + + + + 14.0 + + + + + + + + + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\$(Platform)\Release\Microsoft.Xaml.Interactivity.xml + + + Microsoft.Xaml.Interactivity + + \ No newline at end of file From 06723c248f8cda544971211e9f9b4d5741602d10 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Mon, 29 Jul 2024 14:32:14 -0700 Subject: [PATCH 04/26] Link 'AssemblyInfo' from WinUI project --- .../Microsoft.Xaml.Interactivity.Uwp.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj index afc2659..bc398fd 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj @@ -115,6 +115,9 @@ PackageReference + + + all From bd47f69726c2a3d0c606e477f1d1bdf8fe4d23a9 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Mon, 29 Jul 2024 15:04:21 -0700 Subject: [PATCH 05/26] Fix conditional defines in 'ResourceHelper' --- .../Microsoft.Xaml.Interactivity.Shared/ResourceHelper.cs | 4 ++-- .../Microsoft.Xaml.Interactivity.Uwp.csproj | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/ResourceHelper.cs b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/ResourceHelper.cs index fc4cbc4..06f7989 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/ResourceHelper.cs +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/ResourceHelper.cs @@ -6,13 +6,13 @@ namespace Microsoft.Xaml.Interactivity internal static class ResourceHelper { -#if NET8_0_OR_GREATER +#if NET8_0_OR_GREATER && !MODERN_WINDOWS_UWP private static ResourceLoader strings = new ResourceLoader(ResourceLoader.GetDefaultResourceFilePath(), "Microsoft.Xaml.Interactivity/Strings"); #endif public static string GetString(string resourceName) { -#if !NET8_0_OR_GREATER +#if !NET8_0_OR_GREATER || MODERN_WINDOWS_UWP ResourceLoader strings = ResourceLoader.GetForCurrentView("Microsoft.Xaml.Interactivity/Strings"); #endif return strings.GetString(resourceName); diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj index bc398fd..f41a6bb 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj @@ -13,6 +13,10 @@ $(TargetPlatformMinVersion) false true + + + false + false ..\..\..\out\Uwp\$(SolutionName)\bin\$(Platform)\$(Configuration)\ @@ -198,6 +202,7 @@ ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\$(Platform)\Release\Microsoft.Xaml.Interactivity.xml + $(DefineConstants);MODERN_WINDOWS_UWP Microsoft.Xaml.Interactivity \ No newline at end of file From ab8f382ed4de25cde7a46d3dd40e0cc873318a3c Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Mon, 29 Jul 2024 15:22:45 -0700 Subject: [PATCH 06/26] Bump Windows SDK to 22621 --- .../Microsoft.Xaml.Interactivity.Uwp.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj index f41a6bb..f9e00f0 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj @@ -1,9 +1,9 @@  Library - net8.0-windows10.0.17763.0 + net8.0-windows10.0.22621.0 10.0.17763.0 - 10.0.17763.37-preview + 10.0.22621.37-preview true true Microsoft.Xaml.Interactivity From e6a93614b11336bae5a4266041dd3a66bffa0552 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Mon, 29 Jul 2024 15:34:09 -0700 Subject: [PATCH 07/26] Update and fix 'Microsoft.Xaml.Interactions.Uwp' --- .../BehaviorsSDKManaged.sln | 1 + .../Core/EventTriggerBehavior.cs | 10 +- .../Core/ResourceHelper.cs | 4 +- .../Microsoft.Xaml.Interactions.Uwp.csproj | 218 +++++++++++++++++- .../Microsoft.Xaml.Interactivity.Uwp.csproj | 2 +- 5 files changed, 221 insertions(+), 14 deletions(-) diff --git a/src/BehaviorsSDKManaged/BehaviorsSDKManaged.sln b/src/BehaviorsSDKManaged/BehaviorsSDKManaged.sln index 223128a..61527c1 100644 --- a/src/BehaviorsSDKManaged/BehaviorsSDKManaged.sln +++ b/src/BehaviorsSDKManaged/BehaviorsSDKManaged.sln @@ -283,6 +283,7 @@ Global Microsoft.Xaml.Interactivity.Shared\Microsoft.Xaml.Interactivity.Shared.projitems*{7119f232-7bef-42f9-9ba1-52654adc98b6}*SharedItemsImports = 5 Microsoft.Xaml.Interactivity.Shared\Microsoft.Xaml.Interactivity.Shared.projitems*{7ffc1385-c3e1-487c-9a81-de48dd63ecb9}*SharedItemsImports = 4 Microsoft.Xaml.Interactions.Shared\Microsoft.Xaml.Interactions.Shared.projitems*{a338a7f2-9010-477b-8a6e-6c2b2495c33c}*SharedItemsImports = 4 + Microsoft.Xaml.Interactions.Shared\Microsoft.Xaml.Interactions.Shared.projitems*{b1c5e139-c8df-46b5-9abc-4515bdecafa3}*SharedItemsImports = 5 Microsoft.Xaml.Interactivity.Shared\Microsoft.Xaml.Interactivity.Shared.projitems*{e6a328c8-2d9a-459a-86ee-f1c50cc6dadd}*SharedItemsImports = 5 EndGlobalSection EndGlobal diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Shared/Core/EventTriggerBehavior.cs b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Shared/Core/EventTriggerBehavior.cs index 6b3591e..b7fe757 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Shared/Core/EventTriggerBehavior.cs +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Shared/Core/EventTriggerBehavior.cs @@ -13,6 +13,8 @@ #else using Windows.UI.Xaml; using Windows.UI.Xaml.Media; +#endif +#if WINDOWS_UWP && !NET8_0_OR_GREATER using System.Runtime.InteropServices.WindowsRuntime; #endif @@ -49,7 +51,7 @@ public sealed class EventTriggerBehavior : Trigger private object _resolvedSource; private Delegate _eventHandler; private bool _isLoadedEventRegistered; -#if !WinUI +#if !NET8_0_OR_GREATER private bool _isWindowsRuntimeEvent; private Func _addEventHandlerMethod; private Action _removeEventHandlerMethod; @@ -164,7 +166,7 @@ private void RegisterEvent(string eventName) MethodInfo methodInfo = typeof(EventTriggerBehavior).GetTypeInfo().GetDeclaredMethod("OnEvent"); this._eventHandler = methodInfo.CreateDelegate(info.EventHandlerType, this); -#if WinUI +#if NET8_0_OR_GREATER info.AddEventHandler(this._resolvedSource, this._eventHandler); #else this._isWindowsRuntimeEvent = EventTriggerBehavior.IsWindowsRuntimeEvent(info); @@ -207,7 +209,7 @@ private void UnregisterEvent(string eventName) } EventInfo info = this._resolvedSource.GetType().GetRuntimeEvent(eventName); -#if WinUI +#if NET8_0_OR_GREATER info.RemoveEventHandler(this._resolvedSource, this._eventHandler); #else if (this._isWindowsRuntimeEvent) @@ -256,7 +258,7 @@ private static void OnEventNameChanged(DependencyObject dependencyObject, Depend behavior.RegisterEvent(newEventName); } -#if !WinUI +#if !NET8_0_OR_GREATER private static bool IsWindowsRuntimeEvent(EventInfo eventInfo) { return eventInfo != null && diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Shared/Core/ResourceHelper.cs b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Shared/Core/ResourceHelper.cs index 7884c6f..80f0c6b 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Shared/Core/ResourceHelper.cs +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Shared/Core/ResourceHelper.cs @@ -7,13 +7,13 @@ namespace Microsoft.Xaml.Interactions.Core internal static class ResourceHelper { -#if NET8_0_OR_GREATER +#if NET8_0_OR_GREATER && !MODERN_WINDOWS_UWP private static ResourceLoader strings = new ResourceLoader(ResourceLoader.GetDefaultResourceFilePath(), "Microsoft.Xaml.Interactions/Strings"); #endif public static string GetString(string resourceName) { -#if !NET8_0_OR_GREATER +#if !NET8_0_OR_GREATER || MODERN_WINDOWS_UWP var strings = ResourceLoader.GetForCurrentView("Microsoft.Xaml.Interactions/Strings"); #endif return strings.GetString(resourceName); diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj index fa71b7a..23804e0 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj @@ -1,9 +1,213 @@  + + Library + net8.0-windows10.0.22621.0 + 10.0.22621.0 + 10.0.22621.37-preview + true + true + Microsoft.Xaml.Interactions + AnyCPU;x86;x64;arm64 + win-x86;win-x64;win-arm64 + 10.0.17763.0 + $(TargetPlatformMinVersion) + false + true - - net8.0 - enable - enable - - - + + false + false + + + AnyCPU + true + full + false + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\AnyCPU\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + prompt + 4 + + + AnyCPU + pdbonly + true + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\AnyCPU\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + prompt + 4 + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\AnyCPU\Release\Microsoft.Xaml.Interactions.xml + + + x86 + true + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x86\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + x86 + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x86\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x86\Release\Microsoft.Xaml.Interactions.xml + + + ARM + true + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\ARM\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + ARM + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\ARM\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + + + ARM64 + true + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\ARM64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + ARM64 + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\ARM\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + + + x64 + true + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + x64 + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x64\Release\Microsoft.Xaml.Interactions.xml + + + PackageReference + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + {b1c5e139-c8df-46b5-9abc-4515bdecafa3} + Microsoft.Xaml.Interactivity.Uwp + + + + + Resources\de-DE\Strings.resw + + + + + Resources\en-US\Strings.resw + + + + + Resources\es-ES\Strings.resw + + + + + Resources\fr-FR\Strings.resw + + + + + Resources\it-IT\Strings.resw + + + + + Resources\ja-JP\Strings.resw + + + + + Resources\ko-KR\Strings.resw + + + + + Resources\pt-BR\Strings.resw + + + + + Resources\ru-RU\Strings.resw + + + + + Resources\uk-UA\Strings.resw + + + + + Resources\zh-CN\Strings.resw + + + + + Resources\zh-TW\Strings.resw + + + + + 14.0 + + + + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\$(Platform)\Release\Microsoft.Xaml.Interactions.xml + + + $(DefineConstants);MODERN_WINDOWS_UWP + Microsoft.Xaml.Interactions + + \ No newline at end of file diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj index f9e00f0..8f1b45a 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj @@ -2,7 +2,7 @@ Library net8.0-windows10.0.22621.0 - 10.0.17763.0 + 10.0.22621.0 10.0.22621.37-preview true true From 0d60c701232e2ccf73bbd9c2454c71b86993001a Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Mon, 29 Jul 2024 15:37:14 -0700 Subject: [PATCH 08/26] Bump min SDK to 18362, set default language --- .../Microsoft.Xaml.Interactions.Uwp.csproj | 3 ++- .../Microsoft.Xaml.Interactivity.Uwp.csproj | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj index 23804e0..a32884c 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj @@ -3,13 +3,14 @@ Library net8.0-windows10.0.22621.0 10.0.22621.0 + 10.0.18362.0 10.0.22621.37-preview true true Microsoft.Xaml.Interactions + en-US AnyCPU;x86;x64;arm64 win-x86;win-x64;win-arm64 - 10.0.17763.0 $(TargetPlatformMinVersion) false true diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj index 8f1b45a..2fbaee4 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj @@ -3,13 +3,14 @@ Library net8.0-windows10.0.22621.0 10.0.22621.0 + 10.0.18362.0 10.0.22621.37-preview true true Microsoft.Xaml.Interactivity + en-US AnyCPU;x86;x64;arm64 win-x86;win-x64;win-arm64 - 10.0.17763.0 $(TargetPlatformMinVersion) false true From 9e68c4f95c25163d2580641a77678385cc2e6083 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Mon, 29 Jul 2024 15:43:24 -0700 Subject: [PATCH 09/26] Update .nuspec file --- scripts/Microsoft.Xaml.Behaviors.Uwp.Managed.nuspec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/Microsoft.Xaml.Behaviors.Uwp.Managed.nuspec b/scripts/Microsoft.Xaml.Behaviors.Uwp.Managed.nuspec index ce571d8..3df29f2 100644 --- a/scripts/Microsoft.Xaml.Behaviors.Uwp.Managed.nuspec +++ b/scripts/Microsoft.Xaml.Behaviors.Uwp.Managed.nuspec @@ -25,6 +25,15 @@ + + + + + + + + + From b6ba588ae736b53b4b418bd1cd1a99b6515a71a4 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Thu, 8 Aug 2024 17:06:18 -0700 Subject: [PATCH 10/26] Update Windows SDK projection version --- .../Microsoft.Xaml.Interactions.Uwp.csproj | 422 +++++++++--------- .../Microsoft.Xaml.Interactivity.Uwp.csproj | 14 +- 2 files changed, 218 insertions(+), 218 deletions(-) diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj index a32884c..0284d72 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj @@ -1,214 +1,214 @@  - - Library - net8.0-windows10.0.22621.0 - 10.0.22621.0 - 10.0.18362.0 - 10.0.22621.37-preview - true - true - Microsoft.Xaml.Interactions - en-US - AnyCPU;x86;x64;arm64 - win-x86;win-x64;win-arm64 - $(TargetPlatformMinVersion) - false - true + + Library + net8.0-windows10.0.22621.0 + 10.0.22621.0 + 10.0.18362.0 + 10.0.22621.39 + true + true + Microsoft.Xaml.Interactions + en-US + AnyCPU;x86;x64;arm64 + win-x86;win-x64;win-arm64 + $(TargetPlatformMinVersion) + false + true - - false - false - - - AnyCPU - true - full - false - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\AnyCPU\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - prompt - 4 - - - AnyCPU - pdbonly - true - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\AnyCPU\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - prompt - 4 - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\AnyCPU\Release\Microsoft.Xaml.Interactions.xml - - - x86 - true - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - false - prompt - - - x86 - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - false - prompt - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x86\Release\Microsoft.Xaml.Interactions.xml - - - ARM - true - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - false - prompt - - - ARM - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - false - prompt - - - ARM64 - true - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\ARM64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - false - prompt - - - ARM64 - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - false - prompt - - - x64 - true - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - false - prompt - - - x64 - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - false - prompt - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x64\Release\Microsoft.Xaml.Interactions.xml - - - PackageReference - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - {b1c5e139-c8df-46b5-9abc-4515bdecafa3} - Microsoft.Xaml.Interactivity.Uwp - - - - - Resources\de-DE\Strings.resw - - - - - Resources\en-US\Strings.resw - - - - - Resources\es-ES\Strings.resw - - - - - Resources\fr-FR\Strings.resw - - - - - Resources\it-IT\Strings.resw - - - - - Resources\ja-JP\Strings.resw - - - - - Resources\ko-KR\Strings.resw - - - - - Resources\pt-BR\Strings.resw - - - - - Resources\ru-RU\Strings.resw - - - - - Resources\uk-UA\Strings.resw - - - - - Resources\zh-CN\Strings.resw - - - - - Resources\zh-TW\Strings.resw - - - - - 14.0 - - - - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\$(Platform)\Release\Microsoft.Xaml.Interactions.xml - - - $(DefineConstants);MODERN_WINDOWS_UWP - Microsoft.Xaml.Interactions - + + false + false + + + AnyCPU + true + full + false + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\AnyCPU\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + prompt + 4 + + + AnyCPU + pdbonly + true + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\AnyCPU\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + prompt + 4 + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\AnyCPU\Release\Microsoft.Xaml.Interactions.xml + + + x86 + true + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x86\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + x86 + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x86\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x86\Release\Microsoft.Xaml.Interactions.xml + + + ARM + true + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\ARM\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + ARM + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\ARM\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + + + ARM64 + true + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\ARM64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + ARM64 + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\ARM\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + + + x64 + true + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + x64 + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x64\Release\Microsoft.Xaml.Interactions.xml + + + PackageReference + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + {b1c5e139-c8df-46b5-9abc-4515bdecafa3} + Microsoft.Xaml.Interactivity.Uwp + + + + + Resources\de-DE\Strings.resw + + + + + Resources\en-US\Strings.resw + + + + + Resources\es-ES\Strings.resw + + + + + Resources\fr-FR\Strings.resw + + + + + Resources\it-IT\Strings.resw + + + + + Resources\ja-JP\Strings.resw + + + + + Resources\ko-KR\Strings.resw + + + + + Resources\pt-BR\Strings.resw + + + + + Resources\ru-RU\Strings.resw + + + + + Resources\uk-UA\Strings.resw + + + + + Resources\zh-CN\Strings.resw + + + + + Resources\zh-TW\Strings.resw + + + + + 14.0 + + + + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\$(Platform)\Release\Microsoft.Xaml.Interactions.xml + + + $(DefineConstants);MODERN_WINDOWS_UWP + Microsoft.Xaml.Interactions + \ No newline at end of file diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj index 2fbaee4..21c8747 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj @@ -3,21 +3,21 @@ Library net8.0-windows10.0.22621.0 10.0.22621.0 - 10.0.18362.0 - 10.0.22621.37-preview + 10.0.18362.0 + 10.0.22621.39 true true Microsoft.Xaml.Interactivity - en-US + en-US AnyCPU;x86;x64;arm64 win-x86;win-x64;win-arm64 $(TargetPlatformMinVersion) false true - - + + false - false + false ..\..\..\out\Uwp\$(SolutionName)\bin\$(Platform)\$(Configuration)\ @@ -203,7 +203,7 @@ ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\$(Platform)\Release\Microsoft.Xaml.Interactivity.xml - $(DefineConstants);MODERN_WINDOWS_UWP + $(DefineConstants);MODERN_WINDOWS_UWP Microsoft.Xaml.Interactivity \ No newline at end of file From c4fca520f274464cbf425886ce9a3ca53f6d02b9 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Wed, 21 Aug 2024 21:44:04 -0700 Subject: [PATCH 11/26] Update UWP for .NET .csproj projects --- .../Microsoft.Xaml.Interactions.Uwp.csproj | 34 ++++--------------- .../Microsoft.Xaml.Interactivity.Uwp.csproj | 34 ++++--------------- .../Microsoft.Xaml.Interactivity.WinUI.csproj | 2 +- 3 files changed, 15 insertions(+), 55 deletions(-) diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj index 0284d72..8ba5a59 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj @@ -2,22 +2,21 @@ Library net8.0-windows10.0.22621.0 + 10.0.22621.39 10.0.22621.0 10.0.18362.0 - 10.0.22621.39 - true - true Microsoft.Xaml.Interactions + true + true en-US AnyCPU;x86;x64;arm64 win-x86;win-x64;win-arm64 $(TargetPlatformMinVersion) false true - - - false - false + true + false + 2 AnyCPU @@ -60,26 +59,6 @@ prompt ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x86\Release\Microsoft.Xaml.Interactions.xml - - ARM - true - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - false - prompt - - - ARM - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - false - prompt - ARM64 true @@ -132,6 +111,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj index 21c8747..77b6fb9 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj @@ -2,22 +2,21 @@ Library net8.0-windows10.0.22621.0 + 10.0.22621.39 10.0.22621.0 10.0.18362.0 - 10.0.22621.39 - true - true Microsoft.Xaml.Interactivity + true + true en-US AnyCPU;x86;x64;arm64 win-x86;win-x64;win-arm64 $(TargetPlatformMinVersion) false true - - - false - false + true + false + 2 ..\..\..\out\Uwp\$(SolutionName)\bin\$(Platform)\$(Configuration)\ @@ -60,25 +59,6 @@ prompt ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x86\Release\Microsoft.Xaml.Interactivity.xml - - ARM - true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - false - prompt - - - ARM - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - false - prompt - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\ARM\Release\Microsoft.Xaml.Interactivity.xml - ARM64 true @@ -128,6 +108,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + @@ -198,7 +179,6 @@ - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\$(Platform)\Release\Microsoft.Xaml.Interactivity.xml diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.WinUI/Microsoft.Xaml.Interactivity.WinUI.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.WinUI/Microsoft.Xaml.Interactivity.WinUI.csproj index ef0696a..c064e2f 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.WinUI/Microsoft.Xaml.Interactivity.WinUI.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.WinUI/Microsoft.Xaml.Interactivity.WinUI.csproj @@ -4,10 +4,10 @@ net8.0-windows10.0.17763.0 10.0.17763.41 10.0.17763.0 + 10.0.17763.0 Microsoft.Xaml.Interactivity AnyCPU;x86;x64;arm64 win-x86;win-x64;win-arm64 - 10.0.17763.0 $(TargetPlatformMinVersion) false true From 42bea37a76e11eda8dfaf1f9ef1f731db14118ef Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Wed, 21 Aug 2024 21:44:40 -0700 Subject: [PATCH 12/26] Fix whitespaces --- .../Microsoft.Xaml.Interactions.Uwp.csproj | 384 +++++++++--------- 1 file changed, 192 insertions(+), 192 deletions(-) diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj index 8ba5a59..0ca2c49 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj @@ -1,194 +1,194 @@  - - Library - net8.0-windows10.0.22621.0 - 10.0.22621.39 - 10.0.22621.0 - 10.0.18362.0 - Microsoft.Xaml.Interactions - true - true - en-US - AnyCPU;x86;x64;arm64 - win-x86;win-x64;win-arm64 - $(TargetPlatformMinVersion) - false - true - true - false - 2 - - - AnyCPU - true - full - false - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\AnyCPU\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - prompt - 4 - - - AnyCPU - pdbonly - true - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\AnyCPU\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - prompt - 4 - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\AnyCPU\Release\Microsoft.Xaml.Interactions.xml - - - x86 - true - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - false - prompt - - - x86 - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - false - prompt - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x86\Release\Microsoft.Xaml.Interactions.xml - - - ARM64 - true - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\ARM64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - false - prompt - - - ARM64 - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - false - prompt - - - x64 - true - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - false - prompt - - - x64 - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - false - prompt - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x64\Release\Microsoft.Xaml.Interactions.xml - - - PackageReference - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - {b1c5e139-c8df-46b5-9abc-4515bdecafa3} - Microsoft.Xaml.Interactivity.Uwp - - - - - Resources\de-DE\Strings.resw - - - - - Resources\en-US\Strings.resw - - - - - Resources\es-ES\Strings.resw - - - - - Resources\fr-FR\Strings.resw - - - - - Resources\it-IT\Strings.resw - - - - - Resources\ja-JP\Strings.resw - - - - - Resources\ko-KR\Strings.resw - - - - - Resources\pt-BR\Strings.resw - - - - - Resources\ru-RU\Strings.resw - - - - - Resources\uk-UA\Strings.resw - - - - - Resources\zh-CN\Strings.resw - - - - - Resources\zh-TW\Strings.resw - - - - - 14.0 - - - - ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\$(Platform)\Release\Microsoft.Xaml.Interactions.xml - - - $(DefineConstants);MODERN_WINDOWS_UWP - Microsoft.Xaml.Interactions - + + Library + net8.0-windows10.0.22621.0 + 10.0.22621.39 + 10.0.22621.0 + 10.0.18362.0 + Microsoft.Xaml.Interactions + true + true + en-US + AnyCPU;x86;x64;arm64 + win-x86;win-x64;win-arm64 + $(TargetPlatformMinVersion) + false + true + true + false + 2 + + + AnyCPU + true + full + false + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\AnyCPU\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + prompt + 4 + + + AnyCPU + pdbonly + true + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\AnyCPU\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + prompt + 4 + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\AnyCPU\Release\Microsoft.Xaml.Interactions.xml + + + x86 + true + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x86\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + x86 + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x86\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x86\Release\Microsoft.Xaml.Interactions.xml + + + ARM64 + true + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\ARM64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + ARM64 + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\ARM\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + + + x64 + true + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + x64 + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x64\Release\Microsoft.Xaml.Interactions.xml + + + PackageReference + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + {b1c5e139-c8df-46b5-9abc-4515bdecafa3} + Microsoft.Xaml.Interactivity.Uwp + + + + + Resources\de-DE\Strings.resw + + + + + Resources\en-US\Strings.resw + + + + + Resources\es-ES\Strings.resw + + + + + Resources\fr-FR\Strings.resw + + + + + Resources\it-IT\Strings.resw + + + + + Resources\ja-JP\Strings.resw + + + + + Resources\ko-KR\Strings.resw + + + + + Resources\pt-BR\Strings.resw + + + + + Resources\ru-RU\Strings.resw + + + + + Resources\uk-UA\Strings.resw + + + + + Resources\zh-CN\Strings.resw + + + + + Resources\zh-TW\Strings.resw + + + + + 14.0 + + + + ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\$(Platform)\Release\Microsoft.Xaml.Interactions.xml + + + $(DefineConstants);MODERN_WINDOWS_UWP + Microsoft.Xaml.Interactions + \ No newline at end of file From 1d604e027798634bf9c5c0b4be80bf238dc17c8a Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Tue, 27 Aug 2024 23:32:58 -0700 Subject: [PATCH 13/26] Remove redundant .csproj properties --- .../Microsoft.Xaml.Interactions.Uwp.csproj | 2 -- .../Microsoft.Xaml.Interactions.WinUI.csproj | 4 +--- .../Microsoft.Xaml.Interactivity.Uwp.csproj | 2 -- .../Microsoft.Xaml.Interactivity.WinUI.csproj | 2 -- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj index 0ca2c49..f863dd3 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj @@ -3,7 +3,6 @@ Library net8.0-windows10.0.22621.0 10.0.22621.39 - 10.0.22621.0 10.0.18362.0 Microsoft.Xaml.Interactions true @@ -11,7 +10,6 @@ en-US AnyCPU;x86;x64;arm64 win-x86;win-x64;win-arm64 - $(TargetPlatformMinVersion) false true true diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.WinUI/Microsoft.Xaml.Interactions.WinUI.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.WinUI/Microsoft.Xaml.Interactions.WinUI.csproj index f36c3cf..9738cfd 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.WinUI/Microsoft.Xaml.Interactions.WinUI.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.WinUI/Microsoft.Xaml.Interactions.WinUI.csproj @@ -3,12 +3,10 @@ Library net8.0-windows10.0.17763.0 10.0.17763.41 - 10.0.17763.0 + 10.0.17763.0 Microsoft.Xaml.Interactions AnyCPU;x86;x64;arm64 win-x86;win-x64;win-arm64 - 10.0.17763.0 - $(TargetPlatformMinVersion) false true true diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj index 77b6fb9..2540983 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj @@ -3,7 +3,6 @@ Library net8.0-windows10.0.22621.0 10.0.22621.39 - 10.0.22621.0 10.0.18362.0 Microsoft.Xaml.Interactivity true @@ -11,7 +10,6 @@ en-US AnyCPU;x86;x64;arm64 win-x86;win-x64;win-arm64 - $(TargetPlatformMinVersion) false true true diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.WinUI/Microsoft.Xaml.Interactivity.WinUI.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.WinUI/Microsoft.Xaml.Interactivity.WinUI.csproj index c064e2f..d403e12 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.WinUI/Microsoft.Xaml.Interactivity.WinUI.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.WinUI/Microsoft.Xaml.Interactivity.WinUI.csproj @@ -3,12 +3,10 @@ Library net8.0-windows10.0.17763.0 10.0.17763.41 - 10.0.17763.0 10.0.17763.0 Microsoft.Xaml.Interactivity AnyCPU;x86;x64;arm64 win-x86;win-x64;win-arm64 - $(TargetPlatformMinVersion) false true true From 48e2591fa177a30f0737f8b05c83a280ce19766c Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Thu, 12 Sep 2024 16:46:38 +0200 Subject: [PATCH 14/26] Update CsWinRT to latest --- .../Microsoft.Xaml.Interactions.Uwp.csproj | 2 +- .../Microsoft.Xaml.Interactivity.Uwp.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj index f863dd3..e42f548 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj @@ -109,7 +109,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj index 2540983..5dac28c 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj @@ -106,7 +106,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + From 8dad73904d3e8c29443cf0c2baa762dc91ee4a04 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Mon, 16 Sep 2024 15:07:24 +0200 Subject: [PATCH 15/26] Bump Windows SDK for .NET 9 to 26100 --- .../Microsoft.Xaml.Interactions.Uwp.csproj | 4 ++-- .../Microsoft.Xaml.Interactivity.Uwp.csproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj index e42f548..fbee361 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj @@ -1,8 +1,8 @@  Library - net8.0-windows10.0.22621.0 - 10.0.22621.39 + net8.0-windows10.0.26100.0 + 10.0.26100.39 10.0.18362.0 Microsoft.Xaml.Interactions true diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj index 5dac28c..43c67b3 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj @@ -1,8 +1,8 @@  Library - net8.0-windows10.0.22621.0 - 10.0.22621.39 + net8.0-windows10.0.26100.0 + 10.0.26100.39 10.0.18362.0 Microsoft.Xaml.Interactivity true From 08617eb327a3d75633603f5cf8004b42b4da388c Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Mon, 16 Sep 2024 16:00:08 +0200 Subject: [PATCH 16/26] Fix output path --- .../Microsoft.Xaml.Interactions.DesignTools.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.DesignTools/Microsoft.Xaml.Interactions.DesignTools.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.DesignTools/Microsoft.Xaml.Interactions.DesignTools.csproj index a186cbf..f2c6ced 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.DesignTools/Microsoft.Xaml.Interactions.DesignTools.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.DesignTools/Microsoft.Xaml.Interactions.DesignTools.csproj @@ -95,7 +95,7 @@ http://go.microsoft.com/fwlink/?LinkID=651678 http://go.microsoft.com/fwlink/?LinkID=708511 ..\..\..\scripts\Microsoft.Xaml.Behaviors.Uwp.Managed.nuspec - ..\..\..\scripts + ..\..\..\out\NuGetPackages From 120f26d31699a6bf1f1c8af3e76aba85515edfe3 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Tue, 17 Sep 2024 21:13:37 +0200 Subject: [PATCH 17/26] Pack design files for UWP .NET 9 target --- scripts/Microsoft.Xaml.Behaviors.Uwp.Managed.nuspec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/Microsoft.Xaml.Behaviors.Uwp.Managed.nuspec b/scripts/Microsoft.Xaml.Behaviors.Uwp.Managed.nuspec index 3df29f2..6fb87b1 100644 --- a/scripts/Microsoft.Xaml.Behaviors.Uwp.Managed.nuspec +++ b/scripts/Microsoft.Xaml.Behaviors.Uwp.Managed.nuspec @@ -39,11 +39,21 @@ + + + + + + + + + + From b7d705fc7f4f682e9ba95aa35b4d8e60c714f336 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Mon, 11 Nov 2024 11:31:11 -0800 Subject: [PATCH 18/26] Update Windows SDK package version --- .../Microsoft.Xaml.Interactions.Uwp.csproj | 2 +- .../Microsoft.Xaml.Interactions.WinUI.csproj | 2 +- .../Microsoft.Xaml.Interactivity.Uwp.csproj | 2 +- .../Microsoft.Xaml.Interactivity.WinUI.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj index fbee361..dd327b8 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj @@ -2,7 +2,7 @@ Library net8.0-windows10.0.26100.0 - 10.0.26100.39 + 10.0.26100.54 10.0.18362.0 Microsoft.Xaml.Interactions true diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.WinUI/Microsoft.Xaml.Interactions.WinUI.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.WinUI/Microsoft.Xaml.Interactions.WinUI.csproj index 9738cfd..070fed4 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.WinUI/Microsoft.Xaml.Interactions.WinUI.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.WinUI/Microsoft.Xaml.Interactions.WinUI.csproj @@ -2,7 +2,7 @@ Library net8.0-windows10.0.17763.0 - 10.0.17763.41 + 10.0.17763.53 10.0.17763.0 Microsoft.Xaml.Interactions AnyCPU;x86;x64;arm64 diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj index 43c67b3..17de32d 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj @@ -2,7 +2,7 @@ Library net8.0-windows10.0.26100.0 - 10.0.26100.39 + 10.0.26100.54 10.0.18362.0 Microsoft.Xaml.Interactivity true diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.WinUI/Microsoft.Xaml.Interactivity.WinUI.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.WinUI/Microsoft.Xaml.Interactivity.WinUI.csproj index d403e12..ef8b722 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.WinUI/Microsoft.Xaml.Interactivity.WinUI.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.WinUI/Microsoft.Xaml.Interactivity.WinUI.csproj @@ -2,7 +2,7 @@ Library net8.0-windows10.0.17763.0 - 10.0.17763.41 + 10.0.17763.53 10.0.17763.0 Microsoft.Xaml.Interactivity AnyCPU;x86;x64;arm64 From c2e08f5279fab767667f5cf254adbe1be3e75a70 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Mon, 11 Nov 2024 11:38:00 -0800 Subject: [PATCH 19/26] Reference 'Microsoft.Windows.SDK.CPP' package --- .../Microsoft.Xaml.Interactions.Uwp.csproj | 1 + .../Microsoft.Xaml.Interactivity.Uwp.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj index dd327b8..49043ef 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj @@ -110,6 +110,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj index 17de32d..6e02cbf 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj @@ -107,6 +107,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive + From 9d8f3758ca753171a7568f058b41dee4b72e7e27 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Wed, 13 Nov 2024 12:58:47 -0800 Subject: [PATCH 20/26] Update to .NET 9 SDK and VS 17.12 --- .../Microsoft.Xaml.Interactions.Uwp.csproj | 9 ++++----- .../Microsoft.Xaml.Interactivity.Uwp.csproj | 9 ++++----- src/BehaviorsSDKManaged/global.json | 5 +++-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj index 49043ef..6766d93 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj @@ -1,12 +1,11 @@  Library - net8.0-windows10.0.26100.0 - 10.0.26100.54 + net8.0-windows10.0.18362.0 + 10.0.18362.54 10.0.18362.0 Microsoft.Xaml.Interactions true - true en-US AnyCPU;x86;x64;arm64 win-x86;win-x64;win-arm64 @@ -15,6 +14,7 @@ true false 2 + false AnyCPU @@ -109,8 +109,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj index 6e02cbf..e6d8a7e 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj @@ -1,12 +1,11 @@  Library - net8.0-windows10.0.26100.0 - 10.0.26100.54 + net8.0-windows10.0.18362.0 + 10.0.18362.54 10.0.18362.0 Microsoft.Xaml.Interactivity true - true en-US AnyCPU;x86;x64;arm64 win-x86;win-x64;win-arm64 @@ -15,6 +14,7 @@ true false 2 + false ..\..\..\out\Uwp\$(SolutionName)\bin\$(Platform)\$(Configuration)\ @@ -106,8 +106,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + diff --git a/src/BehaviorsSDKManaged/global.json b/src/BehaviorsSDKManaged/global.json index b084791..aca9b85 100644 --- a/src/BehaviorsSDKManaged/global.json +++ b/src/BehaviorsSDKManaged/global.json @@ -1,8 +1,9 @@ { "sdk": { - "version": "8.0.400", - "rollForward": "latestFeature" + "version": "9.0.100", + "rollForward": "latestFeature", + "allowPrerelease": false }, "msbuild-sdks": { "MSBuild.Sdk.Extras": "3.0.44" From bdec4b07f13547f0dd7896904f7f6ab2e9be0bbb Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Wed, 13 Nov 2024 13:02:05 -0800 Subject: [PATCH 21/26] Update CsWinRT in WinUI projects to 2.1.6 --- .../Microsoft.Xaml.Interactions.WinUI.csproj | 2 +- .../Microsoft.Xaml.Interactivity.WinUI.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.WinUI/Microsoft.Xaml.Interactions.WinUI.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.WinUI/Microsoft.Xaml.Interactions.WinUI.csproj index 070fed4..c1a5b33 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.WinUI/Microsoft.Xaml.Interactions.WinUI.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.WinUI/Microsoft.Xaml.Interactions.WinUI.csproj @@ -109,7 +109,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.WinUI/Microsoft.Xaml.Interactivity.WinUI.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.WinUI/Microsoft.Xaml.Interactivity.WinUI.csproj index ef8b722..ea9ae88 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.WinUI/Microsoft.Xaml.Interactivity.WinUI.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.WinUI/Microsoft.Xaml.Interactivity.WinUI.csproj @@ -106,7 +106,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + From b4c52ba2f9bf88cc2b20ebcf08871d4bb4750d6d Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Wed, 13 Nov 2024 13:05:03 -0800 Subject: [PATCH 22/26] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d084c2f..4eb769e 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ The [documentation](https://github.com/Microsoft/XamlBehaviors/wiki) explains ho #### What You Need -- [Visual Studio 2017 w/ Universal Windows Tools](https://visualstudio.microsoft.com/vs/features/universal-windows-platform/) +- [Visual Studio 2022 17.12+ w/ Universal Windows Tools](https://visualstudio.microsoft.com/vs/features/universal-windows-platform/) - [Multilingual App Toolkit](https://developer.microsoft.com/en-us/windows/develop/multilingual-app-toolkit) #### Clone the Repository From 2f29756f4c4019f6cec904b04017be9a38a4b313 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Wed, 13 Nov 2024 13:08:06 -0800 Subject: [PATCH 23/26] Suppress 'NETSDK1219' warnings --- .../Microsoft.Xaml.Interactions.Uwp.csproj | 3 +++ .../Microsoft.Xaml.Interactivity.Uwp.csproj | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj index 6766d93..603aeb3 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Uwp/Microsoft.Xaml.Interactions.Uwp.csproj @@ -98,6 +98,9 @@ prompt ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x64\Release\Microsoft.Xaml.Interactions.xml + + $(NoWarn);NETSDK1219 + PackageReference diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj index e6d8a7e..50b3964 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Uwp/Microsoft.Xaml.Interactivity.Uwp.csproj @@ -95,6 +95,9 @@ prompt ..\..\..\out\Uwp\BehaviorsSDKManaged\bin\x64\Release\Microsoft.Xaml.Interactivity.xml + + $(NoWarn);NETSDK1219 + PackageReference From 53dba0ffb9a2f4e4a3a16ac8edb2e6c5bf013d81 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Wed, 13 Nov 2024 13:27:30 -0800 Subject: [PATCH 24/26] Install .NET 9 SDK in CI workflows --- .github/workflows/managed-build.yml | 4 ++-- azure-pipelines/build.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/managed-build.yml b/.github/workflows/managed-build.yml index 792a0a1..ae6135f 100644 --- a/.github/workflows/managed-build.yml +++ b/.github/workflows/managed-build.yml @@ -13,10 +13,10 @@ jobs: - name: Checkout XamlBehaviors.git uses: actions/checkout@v3 - - name: Install the .NET 8.0.400 SDK + - name: Install the .NET 9.0.100 SDK uses: actions/setup-dotnet@v3 with: - dotnet-version: 8.0.400 + dotnet-version: 9.0.100 - name: Setup MSBuild uses: microsoft/setup-msbuild@v2 diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml index a827697..fd22588 100644 --- a/azure-pipelines/build.yml +++ b/azure-pipelines/build.yml @@ -82,9 +82,9 @@ extends: SourceFolder: out Contents: '**\' - task: UseDotNet@2 - displayName: Use .NET Core sdk 8.0.400 + displayName: Use .NET SDK 9.0.100 inputs: - version: 8.0.400 + version: 9.0.100 performMultiLevelLookup: true - task: NuGetToolInstaller@1 displayName: Use NuGet 6.x From 006357c14cbff6b9c215cba442aa55e957b8e867 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Wed, 13 Nov 2024 13:28:27 -0800 Subject: [PATCH 25/26] Update GitHub actions --- .github/workflows/managed-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/managed-build.yml b/.github/workflows/managed-build.yml index ae6135f..9af333d 100644 --- a/.github/workflows/managed-build.yml +++ b/.github/workflows/managed-build.yml @@ -11,10 +11,10 @@ jobs: runs-on: windows-latest steps: - name: Checkout XamlBehaviors.git - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install the .NET 9.0.100 SDK - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: 9.0.100 From 60b92f67fff96fda7b4f0058b113f20e30c741e3 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Wed, 13 Nov 2024 14:40:44 -0800 Subject: [PATCH 26/26] Update Microsoft.Xaml.Behaviors.Uwp.Managed.nuspec --- ...icrosoft.Xaml.Behaviors.Uwp.Managed.nuspec | 41 +++++++++++-------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/scripts/Microsoft.Xaml.Behaviors.Uwp.Managed.nuspec b/scripts/Microsoft.Xaml.Behaviors.Uwp.Managed.nuspec index 6fb87b1..ed8948a 100644 --- a/scripts/Microsoft.Xaml.Behaviors.Uwp.Managed.nuspec +++ b/scripts/Microsoft.Xaml.Behaviors.Uwp.Managed.nuspec @@ -13,6 +13,15 @@ http://go.microsoft.com/fwlink/?LinkID=708511 © Microsoft Corporation. All rights reserved. Behavior Action Behaviors Actions Blend Managed C# Interaction Interactivity Interactions + + + + + + + + + @@ -25,34 +34,34 @@ - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + +