diff --git a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
index 069fbd9eb27..1db59a5b434 100644
--- a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
+++ b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
@@ -19,6 +19,11 @@
     <DefineConstants Condition="'$(DisableImplicitFrameworkDefines)' != 'true'">$(DefineConstants);WINRT</DefineConstants>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
+    <UseWpf>true</UseWpf>
+    <EnableDefaultPageItems>false</EnableDefaultPageItems>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit\Microsoft.Toolkit.csproj" />
@@ -40,28 +45,9 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net462'">
-    <Reference Include="System.Data" />
-    <Reference Include="System.ComponentModel" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows" />
-    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     <PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls.WebView" Version="[5.0.0-preview.gb86cb1c4cb,)" />
     <PackageReference Include="Microsoft.Toolkit.Forms.UI.Controls.WebView" Version="[5.0.0-preview.gb86cb1c4cb,)" />
-    <Page Update="PlatformSpecific\NetFramework\PopupWPF.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Update="PlatformSpecific\NetFramework\PopupWPF.xaml.cs">
-      <DependentUpon>PlatformSpecific\NetFramework\PopupWPF.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
   </ItemGroup>
 
   <ItemGroup Condition="!('$(TargetFramework)'=='uap10.0.16299')">
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
index c030d26f429..e62e7d57b1e 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
+++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.4;uap10.0;native;net461;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard1.4;uap10.0;native;net461;netcoreapp3.1</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NETFX_CORE</DefineConstants>
     <Title>Windows Community Toolkit Notifications</Title>
     <Description>
diff --git a/UnitTests/UnitTests.UWP/Helpers/Test_StorageFileHelper.cs b/UnitTests/UnitTests.UWP/Helpers/Test_StorageFileHelper.cs
index ca5218860d5..41d1f36f462 100644
--- a/UnitTests/UnitTests.UWP/Helpers/Test_StorageFileHelper.cs
+++ b/UnitTests/UnitTests.UWP/Helpers/Test_StorageFileHelper.cs
@@ -15,7 +15,7 @@ namespace UnitTests.Helpers
     public class Test_StorageFileHelper
     {
         private const string Sampletext = "Lorem ipsum dolor sit amet";
-        private const string Filename = "filename.txt";
+        private const string Filename = "Test_StorageFileHelper_file.txt";
         private const string PackagedFilePath = @"Assets\Samples\lorem.txt";
 
         [TestCategory("Helpers")]
diff --git a/UnitTests/UnitTests.UWP/Helpers/Test_StreamHelper.cs b/UnitTests/UnitTests.UWP/Helpers/Test_StreamHelper.cs
index 4cc10793cd0..5e7ef684d64 100644
--- a/UnitTests/UnitTests.UWP/Helpers/Test_StreamHelper.cs
+++ b/UnitTests/UnitTests.UWP/Helpers/Test_StreamHelper.cs
@@ -17,7 +17,7 @@ namespace UnitTests.Helpers
     public class Test_StreamHelper
     {
         private const string SampleText = "Lorem ipsum dolor sit amet";
-        private const string Filename = "filename.txt";
+        private const string Filename = "Test_StreamHelper_file.txt";
         private const string PackagedFilePath = @"Assets\Samples\lorem.txt";
 
         [TestCategory("Helpers")]
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0464d953939..76470fb759b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -21,16 +21,9 @@ steps:
   displayName: Setup Environment Variables
   
 - task: NuGetToolInstaller@0
-  displayName: Use NuGet 5.0.0
+  displayName: Use NuGet 5.6.0
   inputs:
-    versionSpec: 5.0.0
-
-- task: UseDotNet@2
-  inputs:
-    packageType: 'sdk'
-    version: '3.1.200'
-    performMultiLevelLookup: true
-  displayName: Use .NET Core sdk 3
+    versionSpec: 5.6.0
 
 - task: DotNetCoreCLI@2  
   inputs: