moved up .netcore.uwp to 6.1.5 and fixed issue with building solution from clean state

Author: nmetulev

Directory.Build.props

@@ -23,15 +23,13 @@
     <DefaultTargetPlatformVersion>17134</DefaultTargetPlatformVersion>
     <DefaultTargetPlatformMinVersion>15063</DefaultTargetPlatformMinVersion>
 	  <PackageOutputPath>$(MSBuildThisFileDirectory)bin\nupkg</PackageOutputPath>
-	  
   </PropertyGroup>
 
   <PropertyGroup>
 	  <SignAssembly Condition="'$(SignAssembly)' == '' and '$(IsUwpProject)' != 'true'" >true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)toolkit.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
-
   <Choose>
     <When Condition="'$(IsWin32Project)' == 'true'">
       <PropertyGroup>
@@ -50,7 +48,6 @@
         <NoWarn>1591</NoWarn>
         <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
         <OutputPath>bin\$(Platform)\$(Configuration)</OutputPath>
-
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
       </PropertyGroup>
       <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@@ -117,6 +114,12 @@
     </When>
   </Choose>
 
+  <PropertyGroup Condition="'$(IsUwpProject)' == 'true'">
+    <!-- 8002 is a strong named -> non-strong-named reference -->
+    <!-- This is valid for platforms other than .NET Framework (and is needed for the UWP targets -->
+    <NoWarn>$(NoWarn);8002</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version=" 2.1.65" PrivateAssets="all" />
   </ItemGroup>

Directory.Build.targets

@@ -1,5 +1,4 @@
 <Project>
-  
   <Choose>
     <When Condition="'$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'native'">
       <!-- UAP versions for uap10.0 where TPMV isn't implied -->
@@ -9,22 +8,14 @@
         <DebugType>Full</DebugType>
       </PropertyGroup>
 
-      <PropertyGroup>
-        <!-- 8002 is a strong named -> non-strong-named reference -->
-        <!-- This is valid for platforms other than .NET Framework (and is needed for the UWP targets -->
-        <NoWarn>$(NoWarn);8002</NoWarn>
-      </PropertyGroup>
-
       <ItemGroup>
-
         <SDKReference Condition="'$(UseWindowsDesktopSdk)' == 'true' " Include="WindowsDesktop, Version=$(TargetPlatformVersion)">
           <Name>Windows Desktop Extensions for the UWP</Name>
         </SDKReference>
         <SDKReference Condition="'$(UseWindowsMobileSdk)' == 'true' " Include="WindowsMobile, Version=$(TargetPlatformVersion)">
           <Name>Windows Mobile Extensions for the UWP</Name>
         </SDKReference>
       </ItemGroup>
-
     </When>
   </Choose>
 

GazeInputTest/GazeInputTest.csproj

@@ -128,7 +128,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.0.8</Version>
+      <Version>6.1.5</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj

@@ -11,7 +11,7 @@ Supports adaptive tiles and adaptive/interactive toasts for Windows 10. It is pa
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'native' ">
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.8" />
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.5" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'native' ">

Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj

@@ -117,7 +117,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.0.8</Version>
+      <Version>6.1.5</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Services.Store.Engagement">
       <Version>10.1711.28001</Version>

Microsoft.Toolkit.Uwp.Samples.BackgroundTasks/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks.csproj

@@ -117,7 +117,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.0.8</Version>
+      <Version>6.1.5</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj

@@ -103,7 +103,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.0.8</Version>
+      <Version>6.1.5</Version>
     </PackageReference>
     <PackageReference Include="MSTest.TestAdapter">
       <Version>1.2.0</Version>

UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj

@@ -103,7 +103,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.0.8</Version>
+      <Version>6.1.5</Version>
     </PackageReference>
     <PackageReference Include="MSTest.TestAdapter">
       <Version>1.2.0</Version>

UnitTests/UnitTests.csproj

@@ -115,7 +115,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.0.8</Version>
+      <Version>6.1.5</Version>
     </PackageReference>
     <PackageReference Include="MSTest.TestAdapter">
       <Version>1.2.0</Version>