Updated to WAS 1.0.0-preview1.

microsoft · Sep 17, 2021 · 6aee9f4 · 6aee9f4
1 parent 732c8bc
commit 6aee9f4
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 9 deletions.
diff --git a/scripts/Microsoft.Xaml.Behaviors.WinUI.Managed.nuspec b/scripts/Microsoft.Xaml.Behaviors.WinUI.Managed.nuspec
@@ -15,7 +15,7 @@
         <tags>Behavior Action Behaviors Actions Blend Managed C# Interaction Interactivity Interactions WinUI</tags>
         <dependencies>
           <group targetFramework="net5.0-windows10.0.18362.0">
-            <dependency id="Microsoft.ProjectReunion" version="0.8.0" />
+            <dependency id="Microsoft.WindowsAppSDK" version="1.0.0-preview1" />
           </group>
         </dependencies>
     </metadata>

diff --git a/src/BehaviorsSDKManaged/Directory.Build.targets b/src/BehaviorsSDKManaged/Directory.Build.targets
@@ -0,0 +1,8 @@
+<Project>
+  <!-- Workaround for https://github.com/microsoft/WindowsAppSDK/issues/1217 -->
+  <Target Name="FixBinPlaceBootstrapDll" BeforeTargets="BinPlaceBootstrapDll">
+    <PropertyGroup>
+      <_WindowsAppSDKFoundationPlatform>x86</_WindowsAppSDKFoundationPlatform>
+    </PropertyGroup>
+  </Target>
+</Project>
diff --git 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/...iorsSDKManaged/Microsoft.Xaml.Interactions.WinUI/Microsoft.Xaml.Interactions.WinUI.csproj b/...iorsSDKManaged/Microsoft.Xaml.Interactions.WinUI/Microsoft.Xaml.Interactions.WinUI.csproj
@@ -122,7 +122,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.ProjectReunion" Version="0.8.0" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-preview1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Xaml.Interactivity.WinUI\Microsoft.Xaml.Interactivity.WinUI.csproj">

diff --git 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
         /// <exception cref="global::System.ArgumentNullException"><paramref name="associatedObject"/> is null.</exception>
         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
@@ -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
@@ -91,7 +91,7 @@ public static IEnumerable<object> ExecuteActions(object sender, ActionCollection
         {
             List<object> results = new List<object>();
 
-            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
@@ -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/...rsSDKManaged/Microsoft.Xaml.Interactivity.WinUI/Microsoft.Xaml.Interactivity.WinUI.csproj b/...rsSDKManaged/Microsoft.Xaml.Interactivity.WinUI/Microsoft.Xaml.Interactivity.WinUI.csproj
@@ -118,7 +118,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.ProjectReunion" Version="0.8.0" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-preview1" />
   </ItemGroup>
   <ItemGroup>
     <PRIResource Include="..\Microsoft.Xaml.Interactivity\Resources\de-DE\Strings.resw">

diff --git a/src/BehaviorsSDKManaged/Version/NuGetPackageVersion.props b/src/BehaviorsSDKManaged/Version/NuGetPackageVersion.props
@@ -1,5 +1,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PackageVersion>2.0.4</PackageVersion>
+    <PackageVersion>2.0.5</PackageVersion>
   </PropertyGroup>
 </Project>
diff --git 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"