diff --git a/scripts/Microsoft.Xaml.Behaviors.WinUI.Managed.nuspec b/scripts/Microsoft.Xaml.Behaviors.WinUI.Managed.nuspec index 7600ba24..1b210a0b 100644 --- a/scripts/Microsoft.Xaml.Behaviors.WinUI.Managed.nuspec +++ b/scripts/Microsoft.Xaml.Behaviors.WinUI.Managed.nuspec @@ -15,7 +15,7 @@ Behavior Action Behaviors Actions Blend Managed C# Interaction Interactivity Interactions WinUI - + diff --git a/src/BehaviorsSDKManaged/Directory.Build.targets b/src/BehaviorsSDKManaged/Directory.Build.targets new file mode 100644 index 00000000..721acacc --- /dev/null +++ b/src/BehaviorsSDKManaged/Directory.Build.targets @@ -0,0 +1,8 @@ + + + + + <_WindowsAppSDKFoundationPlatform>x86 + + + \ No newline at end of file diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Shared/Core/ResourceHelper.cs b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Shared/Core/ResourceHelper.cs index 4b5b8daa..73ad44f0 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Shared/Core/ResourceHelper.cs +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Shared/Core/ResourceHelper.cs @@ -7,9 +7,15 @@ namespace Microsoft.Xaml.Interactions.Core internal static class ResourceHelper { +#if NET5_0 + private static ResourceLoader strings = new ResourceLoader(ResourceLoader.GetDefaultResourceFilePath(), "Microsoft.Xaml.Interactions/Strings"); +#endif + public static string GetString(string resourceName) { - ResourceLoader strings = ResourceLoader.GetForCurrentView("Microsoft.Xaml.Interactions/Strings"); +#if !NET5_0 + var strings = ResourceLoader.GetForCurrentView("Microsoft.Xaml.Interactions/Strings"); +#endif return strings.GetString(resourceName); } 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 cbd35700..70fb866f 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 @@ -122,7 +122,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/Behavior.cs b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/Behavior.cs index c07e897a..30ace317 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/Behavior.cs +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/Behavior.cs @@ -30,7 +30,7 @@ public abstract class Behavior : DependencyObject, IBehavior /// is null. public void Attach(DependencyObject associatedObject) { - if (associatedObject == this.AssociatedObject || Windows.ApplicationModel.DesignMode.DesignModeEnabled) + if (associatedObject == this.AssociatedObject || global::Windows.ApplicationModel.DesignMode.DesignModeEnabled) { return; } diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/BehaviorCollection.cs b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/BehaviorCollection.cs index 8cc2c2d0..1a57482a 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/BehaviorCollection.cs +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/BehaviorCollection.cs @@ -53,7 +53,7 @@ public void Attach(DependencyObject associatedObject) return; } - if (Windows.ApplicationModel.DesignMode.DesignModeEnabled) + if (global::Windows.ApplicationModel.DesignMode.DesignModeEnabled) { return; } diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/Interaction.cs b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/Interaction.cs index 974093d2..945716f9 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/Interaction.cs +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/Interaction.cs @@ -91,7 +91,7 @@ public static IEnumerable ExecuteActions(object sender, ActionCollection { List results = new List(); - if (actions == null || Windows.ApplicationModel.DesignMode.DesignModeEnabled) + if (actions == null || global::Windows.ApplicationModel.DesignMode.DesignModeEnabled) { return results; } diff --git a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/ResourceHelper.cs b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/ResourceHelper.cs index 8029ae1f..07c287a4 100644 --- a/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/ResourceHelper.cs +++ b/src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/ResourceHelper.cs @@ -6,9 +6,15 @@ namespace Microsoft.Xaml.Interactivity internal static class ResourceHelper { +#if NET5_0 + private static ResourceLoader strings = new ResourceLoader(ResourceLoader.GetDefaultResourceFilePath(), "Microsoft.Xaml.Interactivity/Strings"); +#endif + public static string GetString(string resourceName) { +#if !NET5_0 ResourceLoader strings = ResourceLoader.GetForCurrentView("Microsoft.Xaml.Interactivity/Strings"); +#endif return strings.GetString(resourceName); } 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 2c7ad1f8..d19bb598 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 @@ -118,7 +118,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/BehaviorsSDKManaged/Version/NuGetPackageVersion.props b/src/BehaviorsSDKManaged/Version/NuGetPackageVersion.props index fdc54681..517c856e 100644 --- a/src/BehaviorsSDKManaged/Version/NuGetPackageVersion.props +++ b/src/BehaviorsSDKManaged/Version/NuGetPackageVersion.props @@ -1,5 +1,5 @@ - 2.0.4 + 2.0.5 diff --git a/src/BehaviorsSDKManaged/global.json b/src/BehaviorsSDKManaged/global.json index 6bfceb5b..8b6f5ef1 100644 --- a/src/BehaviorsSDKManaged/global.json +++ b/src/BehaviorsSDKManaged/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "5.0.301" + "version": "5.0.401" }, "msbuild-sdks": { "MSBuild.Sdk.Extras": "3.0.23"