Use "MSBuild.NET.Extras.Sdk"

This replacement for "MSBuild.Sdk.Extras" contains fixes around UWP project setup and build!
CommunityToolkit · Sep 1, 2021 · a501027 · a501027
1 parent 75ea143
commit a501027
Show file tree

Hide file tree

Showing 65 changed files with 171 additions and 176 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -31,8 +31,8 @@
       <PropertyGroup>
         <!-- Code CS8002 is a warning for strong named -> non-strong-named reference. This is valid for platforms other than .NET Framework (and is needed for the UWP targets. -->
         <NoWarn>$(NoWarn);CS8002</NoWarn>
-        <!-- For including default @(Page) and @(Resource) items via 'MSBuild.Sdk.Extras' Sdk package. Also provides up to date check and file nesting -->
-        <ExtrasEnableDefaultXamlItems>true</ExtrasEnableDefaultXamlItems>
+        <!-- For including default @(Page) and @(Resource) items via 'MSBuild.NET.Extras.Sdk' Sdk package. Also provides up to date check and file nesting -->
+        <EnableDefaultXamlItems>true</EnableDefaultXamlItems>
       </PropertyGroup>
     </When>
   </Choose>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -2,7 +2,6 @@
 
   <PropertyGroup Label="Core">
     <NETStandardImplicitPackageVersion>2.0.3</NETStandardImplicitPackageVersion>
-    <ExtrasUwpMetaPackageVersion>6.2.12</ExtrasUwpMetaPackageVersion>
   </PropertyGroup>
 
   <ItemGroup Label="Core">
@@ -12,8 +11,8 @@
     <PackageVersion Include="Microsoft.UI.Xaml" Version="2.6.2" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.1" />
     <PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
-    <!-- MSBuild SDK Extras refernces the following package implicitly -->
-    <PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.12" Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'" />
+    <!-- MSBuild .NET Extras SDK refernces the following package implicitly -->
+    <PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.12" Condition="'$(UsingMSBuildNETExtrasSdk)' != 'true'" />
     <!-- C# Compiler SDK -->
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.11.0" />

diff --git a/GazeInputTest/GazeInputTest.csproj b/GazeInputTest/GazeInputTest.csproj
@@ -22,7 +22,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -31,7 +31,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UAP</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -43,7 +43,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>ARM</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -52,7 +52,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
     <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UAP</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>ARM</PlatformTarget>
@@ -64,7 +64,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\ARM64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>ARM64</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -73,7 +73,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
     <OutputPath>bin\ARM64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UAP</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>ARM64</PlatformTarget>
@@ -85,7 +85,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -94,7 +94,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UAP</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x64</PlatformTarget>

diff --git a/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj b/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="MSBuild.NET.Extras.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>uap10.0.17763</TargetFrameworks>

diff --git a/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj b/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="MSBuild.NET.Extras.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>uap10.0.17763</TargetFrameworks>

diff --git a/...soft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj b/...soft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="MSBuild.NET.Extras.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>uap10.0.17134</TargetFrameworks>

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Badges/BadgeGlyphContent.cs b/Microsoft.Toolkit.Uwp.Notifications/Badges/BadgeGlyphContent.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-#if WINDOWS_UWP
+#if WINDOWS_UAP
 using Windows.Data.Xml.Dom;
 #endif
 
@@ -80,7 +80,7 @@ public override string ToString()
             return GetContent();
         }
 
-#if WINDOWS_UWP
+#if WINDOWS_UAP
         /// <summary>
         /// Retrieves the notification XML content as a WinRT Xml document.
         /// </summary>

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Badges/BadgeNumericContent.cs b/Microsoft.Toolkit.Uwp.Notifications/Badges/BadgeNumericContent.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if WINDOWS_UWP
+#if WINDOWS_UAP
 using Windows.Data.Xml.Dom;
 #endif
 
@@ -62,7 +62,7 @@ public override string ToString()
             return GetContent();
         }
 
-#if WINDOWS_UWP
+#if WINDOWS_UAP
         /// <summary>
         /// Retrieves the notification Xml content as a WinRT Xml document.
         /// </summary>

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Common/BaseElement.cs b/Microsoft.Toolkit.Uwp.Notifications/Common/BaseElement.cs
@@ -5,7 +5,7 @@
 using System.IO;
 using System.Text;
 
-#if WINDOWS_UWP
+#if WINDOWS_UAP
 using Windows.Data.Xml.Dom;
 #endif
 
@@ -40,7 +40,7 @@ public string GetContent()
             }
         }
 
-#if WINDOWS_UWP
+#if WINDOWS_UAP
         /// <summary>
         /// Retrieves the notification XML content as a WinRT XML document.
         /// </summary>

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Common/INotificationContent.cs b/Microsoft.Toolkit.Uwp.Notifications/Common/INotificationContent.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if WINDOWS_UWP
+#if WINDOWS_UAP
 using Windows.Data.Xml.Dom;
 #endif
 
@@ -19,7 +19,7 @@ public interface INotificationContent
         /// <returns>The notification Xml content as a string.</returns>
         string GetContent();
 
-#if WINDOWS_UWP
+#if WINDOWS_UAP
         /// <summary>
         /// Retrieves the notification Xml content as a WinRT Xml document.
         /// </summary>

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Common/LimitedList{T}.cs b/Microsoft.Toolkit.Uwp.Notifications/Common/LimitedList{T}.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-#if WINDOWS_UWP
+#if WINDOWS_UAP
 
 #endif
 

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Common/NotificationContentValidationException.cs b/Microsoft.Toolkit.Uwp.Notifications/Common/NotificationContentValidationException.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-#if WINDOWS_UWP
+#if WINDOWS_UAP
 
 #endif
 

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Common/NotificationXmlAttributeAttribute.cs b/Microsoft.Toolkit.Uwp.Notifications/Common/NotificationXmlAttributeAttribute.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-#if WINDOWS_UWP
+#if WINDOWS_UAP
 
 #endif
 

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Common/NotificationXmlContentAttribute.cs b/Microsoft.Toolkit.Uwp.Notifications/Common/NotificationXmlContentAttribute.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-#if WINDOWS_UWP
+#if WINDOWS_UAP
 
 #endif
 

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Common/NotificationXmlElementAttribute.cs b/Microsoft.Toolkit.Uwp.Notifications/Common/NotificationXmlElementAttribute.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-#if WINDOWS_UWP
+#if WINDOWS_UAP
 
 #endif
 

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Common/XmlWriterHelper.cs b/Microsoft.Toolkit.Uwp.Notifications/Common/XmlWriterHelper.cs
@@ -8,7 +8,7 @@
 using System.Linq;
 using System.Reflection;
 
-#if WINDOWS_UWP
+#if WINDOWS_UAP
 
 #endif
 

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="MSBuild.NET.Extras.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard1.4;uap10.0.16299;net461;netcoreapp3.1;net5.0;net5.0-windows10.0.17763;native</TargetFrameworks>
@@ -14,8 +14,8 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0-windows10.0.17763'">
-    <!-- Define the WINDOWS_UWP conditional symbol, since the 'Windows.Data.Xml' and the 'Windows.UI.Notification' namespaces are available -->
-    <DefineConstants>$(DefineConstants);WINDOWS_UWP;WIN32</DefineConstants>
+    <!-- Define the WINDOWS_UAP conditional symbol, since the 'Windows.Data.Xml' and the 'Windows.UI.Notification' namespaces are available -->
+    <DefineConstants>$(DefineConstants);WINDOWS_UAP;WIN32</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'native'">
@@ -30,7 +30,7 @@
     <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
     <!-- Misc -->
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
-    <DefineConstants>$(DefineConstants);WINDOWS_UWP;WINRT</DefineConstants>
+    <DefineConstants>$(DefineConstants);WINDOWS_UAP;WINRT</DefineConstants>
     <LanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
     <!-- Workaround for issue NuGet/Home#8388; Restore conflict in VS IDE 2019 during DesignTime vs BuildTime. -->
     <NuGetTargetMoniker Condition="'$(DesignTimeBuild)' != 'true'">UAP,Version=v10.0</NuGetTargetMoniker>
@@ -58,10 +58,6 @@
     <PackageReference Include="System.Drawing.Common" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'native'">
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" PrivateAssets="All" />
-  </ItemGroup>
-
   <!-- Native (C++) does not need 'System.ValueTuple' (plus it is incompatible with this package) -->
   <ItemGroup Condition="'$(TargetFramework)' != 'native'">
     <PackageReference Include="System.ValueTuple" />

diff --git a/Microsoft.Toolkit.Uwp.Notifications/ReadMe.md b/Microsoft.Toolkit.Uwp.Notifications/ReadMe.md
@@ -3,7 +3,7 @@ Welcome to the Notifications section of the toolkit! This contains the Notificat
 ## Where should I add new code?
 Any code for generating notifications should be written in the Microsoft.Toolkit.Uwp.Notifications project.
 
-If there's UWP-specific code, use the appropriate `#ifdef`, `WINDOWS_UWP` or `WINRT`.
+If there's UWP-specific code, use the appropriate `#ifdef`, `WINDOWS_UAP` or `WINRT`.
 
 ## What are all the projects for?
 All the code is contained on the Microsoft.Toolkit.Uwp.Notifications project.

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Tiles/TileContent.cs b/Microsoft.Toolkit.Uwp.Notifications/Tiles/TileContent.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if WINDOWS_UWP
+#if WINDOWS_UAP
 using Windows.Data.Xml.Dom;
 using Windows.UI.Notifications;
 #endif
@@ -28,7 +28,7 @@ public string GetContent()
             return ConvertToElement().GetContent();
         }
 
-#if WINDOWS_UWP
+#if WINDOWS_UAP
         /// <summary>
         /// Retrieves the notification XML content as a WinRT XmlDocument, so that it can be used with a local Tile notification's constructor on either <see cref="TileNotification"/> or <see cref="ScheduledTileNotification"/>.
         /// </summary>

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/CustomizeToast.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/CustomizeToast.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if WINDOWS_UWP
+#if WINDOWS_UAP
 
 using Windows.Foundation;
 using Windows.UI.Notifications;

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Visuals.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Visuals.cs
@@ -7,7 +7,7 @@
 using System.Linq;
 using System.Text;
 
-#if WINDOWS_UWP
+#if WINDOWS_UAP
 using Windows.UI.Notifications;
 #endif
 
@@ -79,7 +79,7 @@ private IList<IToastBindingGenericChild> VisualChildren
             }
         }
 
-#if WINDOWS_UWP
+#if WINDOWS_UAP
 #if !WINRT
         /// <summary>
         /// Create an instance of NotificationData that can be used to update toast that has a progress bar.

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs
@@ -396,7 +396,7 @@ public ToastContent GetToastContent()
             return Content;
         }
 
-#if WINDOWS_UWP
+#if WINDOWS_UAP
         /// <summary>
         /// Retrieves the notification XML content as a WinRT XmlDocument, so that it can be used with a local Toast notification's constructor on either <see cref="Windows.UI.Notifications.ToastNotification"/> or <see cref="Windows.UI.Notifications.ScheduledToastNotification"/>.
         /// </summary>

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationHistoryCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationHistoryCompat.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if WINDOWS_UWP
+#if WINDOWS_UAP
 
 using System.Collections.Generic;
 using Windows.UI.Notifications;

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if WINDOWS_UWP
+#if WINDOWS_UAP
 
 using System;
 using System.Collections.Generic;

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotifierCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotifierCompat.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if WINDOWS_UWP
+#if WINDOWS_UAP
 
 using System.Collections.Generic;
 using Windows.UI.Notifications;

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastContent.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastContent.cs
@@ -4,7 +4,7 @@
 
 using System;
 using System.Collections.Generic;
-#if WINDOWS_UWP
+#if WINDOWS_UAP
 using Windows.Data.Xml.Dom;
 using Windows.UI.Notifications;
 #endif
@@ -100,7 +100,7 @@ public string GetContent()
             return ConvertToElement().GetContent();
         }
 
-#if WINDOWS_UWP
+#if WINDOWS_UAP
 
         /// <summary>
         /// Retrieves the notification XML content as a WinRT XmlDocument, so that it can be used with a local Toast notification's constructor on either <see cref="ToastNotification"/> or <see cref="ScheduledToastNotification"/>.