From a468c4d1680b1dccb75eee46492db836f9653ba4 Mon Sep 17 00:00:00 2001
From: Ivan Matkov <matkov.ivan@gmail.com>
Date: Thu, 28 Jul 2022 13:29:57 +0200
Subject: [PATCH] Remove extra .NET 5 target

---
 .../Microsoft.AppCenter.WindowsDesktop.csproj |  2 +-
 ....AppCenter.Analytics.WindowsDesktop.csproj |  2 +-
 ...ft.AppCenter.Crashes.WindowsDesktop.csproj |  2 +-
 nuget/AppCenter.nuspec                        | 32 +++++++------------
 nuget/AppCenterAnalytics.nuspec               | 26 +++++++--------
 nuget/AppCenterCrashes.nuspec                 | 26 +++++++--------
 nuget/WindowsAppCenter.nuspec                 | 32 +++++++------------
 nuget/WindowsAppCenterAnalytics.nuspec        | 26 +++++++--------
 nuget/WindowsAppCenterCrashes.nuspec          | 26 +++++++--------
 scripts/configuration/ac-build-config.xml     | 13 +++-----
 10 files changed, 73 insertions(+), 114 deletions(-)

diff --git a/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Microsoft.AppCenter.WindowsDesktop.csproj b/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Microsoft.AppCenter.WindowsDesktop.csproj
index e7e6eb19e..8bdd9e02a 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Microsoft.AppCenter.WindowsDesktop.csproj
+++ b/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Microsoft.AppCenter.WindowsDesktop.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net461;net472;net5.0-windows;net5.0-windows10.0.17763.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net461;net472;net5.0-windows10.0.17763.0</TargetFrameworks>
     <RootNamespace>Microsoft.AppCenter</RootNamespace>
     <UseWindowsForms>true</UseWindowsForms>
     <Version>4.6.0-SNAPSHOT</Version>
diff --git a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.WindowsDesktop/Microsoft.AppCenter.Analytics.WindowsDesktop.csproj b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.WindowsDesktop/Microsoft.AppCenter.Analytics.WindowsDesktop.csproj
index fff1556b1..1cc861adf 100644
--- a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.WindowsDesktop/Microsoft.AppCenter.Analytics.WindowsDesktop.csproj
+++ b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.WindowsDesktop/Microsoft.AppCenter.Analytics.WindowsDesktop.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net461;net472;net5.0-windows;net5.0-windows10.0.17763.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net461;net472;net5.0-windows10.0.17763.0</TargetFrameworks>
     <RootNamespace>Microsoft.AppCenter.Analytics</RootNamespace>
     <UseWindowsForms>true</UseWindowsForms>
     <Version>4.6.0-SNAPSHOT</Version>
diff --git a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.WindowsDesktop/Microsoft.AppCenter.Crashes.WindowsDesktop.csproj b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.WindowsDesktop/Microsoft.AppCenter.Crashes.WindowsDesktop.csproj
index 74d2e7e15..9ff855746 100644
--- a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.WindowsDesktop/Microsoft.AppCenter.Crashes.WindowsDesktop.csproj
+++ b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.WindowsDesktop/Microsoft.AppCenter.Crashes.WindowsDesktop.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net461;net472;net5.0-windows;net5.0-windows10.0.17763.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net461;net472;net5.0-windows10.0.17763.0</TargetFrameworks>
     <RootNamespace>Microsoft.AppCenter.Crashes</RootNamespace>
     <UseWindowsForms>true</UseWindowsForms>
     <Version>4.6.0-SNAPSHOT</Version>
diff --git a/nuget/AppCenter.nuspec b/nuget/AppCenter.nuspec
index c689f720c..5b8569d0b 100644
--- a/nuget/AppCenter.nuspec
+++ b/nuget/AppCenter.nuspec
@@ -34,12 +34,6 @@
         <dependency id="System.Management" version="6.0.0"/>
         <dependency id="System.Configuration.ConfigurationManager" version="6.0.0"/>
       </group>
-      <group targetFramework="net5.0-windows7.0">
-        <dependency id="Newtonsoft.Json" version="13.0.1"/>
-        <dependency id="SQLitePCLRaw.bundle_green" version="2.1.0" />
-        <dependency id="System.Management" version="6.0.0"/>
-        <dependency id="System.Configuration.ConfigurationManager" version="6.0.0"/>
-      </group>
       <group targetFramework="net5.0-windows10.0.17763.0">
         <dependency id="Newtonsoft.Json" version="13.0.1"/>
         <dependency id="SQLitePCLRaw.bundle_green" version="2.1.0" />
@@ -95,22 +89,18 @@
     <file src="$uwp_dir$/Microsoft.AppCenter.dll" target="lib/uap10.0" />
     <file src="$uwp_dir$/Microsoft.AppCenter.xml" target="lib/uap10.0" />
 
-    <!-- Windows Classic Desktop (WPF and WinForms) -->
-    <file src="$windows_desktop_dir$/Microsoft.AppCenter.dll" target="lib/net461" />
-    <file src="$windows_desktop_dir$/Microsoft.AppCenter.xml" target="lib/net461" />
+    <!-- Windows Classic Desktop (WPF and WinForms) for .NET Framework -->
+    <file src="$windows_net461_dir$/Microsoft.AppCenter.dll" target="lib/net461" />
+    <file src="$windows_net461_dir$/Microsoft.AppCenter.xml" target="lib/net461" />
+    <file src="$windows_net472_dir$/Microsoft.AppCenter.dll" target="lib/net472" />
+    <file src="$windows_net472_dir$/Microsoft.AppCenter.xml" target="lib/net472" />
 
-    <!-- Windows Classic Desktop (WPF and WinForms) for .NETFramework 4.7.2 -->
-    <file src="$windows_desktop_net472_dir$/Microsoft.AppCenter.dll" target="lib/net472" />
-    <file src="$windows_desktop_net472_dir$/Microsoft.AppCenter.xml" target="lib/net472" />
+    <!-- Windows Desktop for .NET Core and .NET 5 with old OS targets -->
+    <file src="$windows_netcore_dir$/Microsoft.AppCenter.dll" target="lib/netcoreapp3.1" />
+    <file src="$windows_netcore_dir$/Microsoft.AppCenter.xml" target="lib/netcoreapp3.1" />
 
-    <!-- WindowsDesktop (WPF and WinForms) for .NET Core -->
-    <file src="$windows_desktop_netcore_dir$/Microsoft.AppCenter.dll" target="lib/netcoreapp3.1" />
-    <file src="$windows_desktop_netcore_dir$/Microsoft.AppCenter.xml" target="lib/netcoreapp3.1" />
-    <file src="$windows_desktop_net5_dir$/Microsoft.AppCenter.dll" target="lib/net5.0-windows7.0" />
-    <file src="$windows_desktop_net5_dir$/Microsoft.AppCenter.xml" target="lib/net5.0-windows7.0" />
-
-    <!-- WinUI-->
-    <file src="$windows_desktop_net5_winui_dir$/Microsoft.AppCenter.dll" target="lib/net5.0-windows10.0.17763.0" />
-    <file src="$windows_desktop_net5_winui_dir$/Microsoft.AppCenter.xml" target="lib/net5.0-windows10.0.17763.0" />
+    <!-- Windows Desktop for WinUI and modern OS targets -->
+    <file src="$windows_net5_dir$/Microsoft.AppCenter.dll" target="lib/net5.0-windows10.0.17763.0" />
+    <file src="$windows_net5_dir$/Microsoft.AppCenter.xml" target="lib/net5.0-windows10.0.17763.0" />
   </files>
 </package>
diff --git a/nuget/AppCenterAnalytics.nuspec b/nuget/AppCenterAnalytics.nuspec
index ebb8dd8f6..9fac2d928 100644
--- a/nuget/AppCenterAnalytics.nuspec
+++ b/nuget/AppCenterAnalytics.nuspec
@@ -46,22 +46,18 @@
     <file src="$uwp_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/uap10.0" />
     <file src="$uwp_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/uap10.0" />
 
-    <!-- WindowsDesktop (WPF and WinForms) for .NET Framework -->
-    <file src="$windows_desktop_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/net461" />
-    <file src="$windows_desktop_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/net461" />
+    <!-- Windows Classic Desktop (WPF and WinForms) for .NET Framework -->
+    <file src="$windows_net461_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/net461" />
+    <file src="$windows_net461_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/net461" />
+    <file src="$windows_net472_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/net472" />
+    <file src="$windows_net472_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/net472" />
 
-    <!-- Windows Classic Desktop (WPF and WinForms) for .NETFramework 471 -->
-    <file src="$windows_desktop_net472_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/net472" />
-    <file src="$windows_desktop_net472_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/net472" />
+    <!-- Windows Desktop for .NET Core and .NET 5 with old OS targets -->
+    <file src="$windows_netcore_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/netcoreapp3.1" />
+    <file src="$windows_netcore_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/netcoreapp3.1" />
 
-    <!-- WindowsDesktop (WPF and WinForms) for .NET Core -->
-    <file src="$windows_desktop_netcore_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/netcoreapp3.1" />
-    <file src="$windows_desktop_netcore_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/netcoreapp3.1" />
-    <file src="$windows_desktop_net5_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/net5.0-windows7.0" />
-    <file src="$windows_desktop_net5_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/net5.0-windows7.0" />
-        
-    <!-- WinUI -->
-    <file src="$windows_desktop_net5_winui_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/net5.0-windows10.0.17763.0" />
-    <file src="$windows_desktop_net5_winui_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/net5.0-windows10.0.17763.0" />
+    <!-- Windows Desktop for WinUI and modern OS targets -->
+    <file src="$windows_net5_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/net5.0-windows10.0.17763.0" />
+    <file src="$windows_net5_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/net5.0-windows10.0.17763.0" />
   </files>
 </package>
diff --git a/nuget/AppCenterCrashes.nuspec b/nuget/AppCenterCrashes.nuspec
index 4d30910fe..c12ff5026 100644
--- a/nuget/AppCenterCrashes.nuspec
+++ b/nuget/AppCenterCrashes.nuspec
@@ -52,22 +52,18 @@
     <file src="$uwp_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/uap10.0" />
     <file src="$uwp_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/uap10.0" />
 
-    <!-- WindowsDesktop (WPF and WinForms) for .NET framework -->
-    <file src="$windows_desktop_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/net461" />
-    <file src="$windows_desktop_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/net461" />
+    <!-- Windows Classic Desktop (WPF and WinForms) for .NET Framework -->
+    <file src="$windows_net461_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/net461" />
+    <file src="$windows_net461_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/net461" />
+    <file src="$windows_net472_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/net472" />
+    <file src="$windows_net472_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/net472" />
 
-    <!-- Windows Classic Desktop (WPF and WinForms) for .NETFramework 471 -->
-    <file src="$windows_desktop_net472_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/net472" />
-    <file src="$windows_desktop_net472_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/net472" />
+    <!-- Windows Desktop for .NET Core and .NET 5 with old OS targets -->
+    <file src="$windows_netcore_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/netcoreapp3.1" />
+    <file src="$windows_netcore_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/netcoreapp3.1" />
 
-    <!-- WindowsDesktop (WPF and WinForms) for .NET Core -->
-    <file src="$windows_desktop_netcore_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/netcoreapp3.1" />
-    <file src="$windows_desktop_netcore_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/netcoreapp3.1" />
-    <file src="$windows_desktop_net5_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/net5.0-windows7.0" />
-    <file src="$windows_desktop_net5_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/net5.0-windows7.0" />
-
-    <!-- WinUI -->
-    <file src="$windows_desktop_net5_winui_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/net5.0-windows10.0.17763.0" />
-    <file src="$windows_desktop_net5_winui_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/net5.0-windows10.0.17763.0" />
+    <!-- Windows Desktop for WinUI and modern OS targets -->
+    <file src="$windows_net5_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/net5.0-windows10.0.17763.0" />
+    <file src="$windows_net5_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/net5.0-windows10.0.17763.0" />
   </files>
 </package>
diff --git a/nuget/WindowsAppCenter.nuspec b/nuget/WindowsAppCenter.nuspec
index 7e4682947..0419c121e 100644
--- a/nuget/WindowsAppCenter.nuspec
+++ b/nuget/WindowsAppCenter.nuspec
@@ -34,12 +34,6 @@
         <dependency id="System.Management" version="6.0.0"/>
         <dependency id="System.Configuration.ConfigurationManager" version="6.0.0"/>
       </group>
-      <group targetFramework="net5.0-windows7.0">
-        <dependency id="Newtonsoft.Json" version="13.0.1"/>
-        <dependency id="SQLitePCLRaw.bundle_green" version="2.1.0" />
-        <dependency id="System.Management" version="6.0.0"/>
-        <dependency id="System.Configuration.ConfigurationManager" version="6.0.0"/>
-      </group>
       <group targetFramework="net5.0-windows10.0.17763.0">
         <dependency id="Newtonsoft.Json" version="13.0.1"/>
         <dependency id="SQLitePCLRaw.bundle_green" version="2.1.0" />
@@ -68,22 +62,18 @@
     <file src="$uwp_dir$/Microsoft.AppCenter.dll" target="lib/uap10.0" />
     <file src="$uwp_dir$/Microsoft.AppCenter.xml" target="lib/uap10.0" />
 
-    <!-- WindowsDesktop (WPF and WinForms) for .NET Framework -->
-    <file src="$windows_desktop_dir$/Microsoft.AppCenter.dll" target="lib/net461" />
-    <file src="$windows_desktop_dir$/Microsoft.AppCenter.xml" target="lib/net461" />
+    <!-- Windows Classic Desktop (WPF and WinForms) for .NET Framework -->
+    <file src="$windows_net461_dir$/Microsoft.AppCenter.dll" target="lib/net461" />
+    <file src="$windows_net461_dir$/Microsoft.AppCenter.xml" target="lib/net461" />
+    <file src="$windows_net472_dir$/Microsoft.AppCenter.dll" target="lib/net472" />
+    <file src="$windows_net472_dir$/Microsoft.AppCenter.xml" target="lib/net472" />
 
-    <!-- Windows Classic Desktop (WPF and WinForms) for .NETFramework 4.7.2 -->
-    <file src="$windows_desktop_net472_dir$/Microsoft.AppCenter.dll" target="lib/net472" />
-    <file src="$windows_desktop_net472_dir$/Microsoft.AppCenter.xml" target="lib/net472" />
+    <!-- Windows Desktop for .NET Core and .NET 5 with old OS targets -->
+    <file src="$windows_netcore_dir$/Microsoft.AppCenter.dll" target="lib/netcoreapp3.1" />
+    <file src="$windows_netcore_dir$/Microsoft.AppCenter.xml" target="lib/netcoreapp3.1" />
 
-    <!-- WindowsDesktop (WPF and WinForms) for .NET Core -->
-    <file src="$windows_desktop_netcore_dir$/Microsoft.AppCenter.dll" target="lib/netcoreapp3.1" />
-    <file src="$windows_desktop_netcore_dir$/Microsoft.AppCenter.xml" target="lib/netcoreapp3.1" />
-    <file src="$windows_desktop_net5_dir$/Microsoft.AppCenter.dll" target="lib/net5.0-windows7.0" />
-    <file src="$windows_desktop_net5_dir$/Microsoft.AppCenter.xml" target="lib/net5.0-windows7.0" />
-    
-    <!-- WinUI -->
-    <file src="$windows_desktop_net5_winui_dir$/Microsoft.AppCenter.dll" target="lib/net5.0-windows10.0.17763.0" />
-    <file src="$windows_desktop_net5_winui_dir$/Microsoft.AppCenter.xml" target="lib/net5.0-windows10.0.17763.0" />
+    <!-- Windows Desktop for WinUI and modern OS targets -->
+    <file src="$windows_net5_dir$/Microsoft.AppCenter.dll" target="lib/net5.0-windows10.0.17763.0" />
+    <file src="$windows_net5_dir$/Microsoft.AppCenter.xml" target="lib/net5.0-windows10.0.17763.0" />
   </files>
 </package>
diff --git a/nuget/WindowsAppCenterAnalytics.nuspec b/nuget/WindowsAppCenterAnalytics.nuspec
index 9881081f0..770e7965c 100644
--- a/nuget/WindowsAppCenterAnalytics.nuspec
+++ b/nuget/WindowsAppCenterAnalytics.nuspec
@@ -24,22 +24,18 @@
     <file src="$uwp_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/uap10.0" />
     <file src="$uwp_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/uap10.0" />
 
-    <!-- WindowsDesktop (WPF and WinForms) for .NET Framework -->
-    <file src="$windows_desktop_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/net461" />
-    <file src="$windows_desktop_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/net461" />
+    <!-- Windows Classic Desktop (WPF and WinForms) for .NET Framework -->
+    <file src="$windows_net461_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/net461" />
+    <file src="$windows_net461_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/net461" />
+    <file src="$windows_net472_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/net472" />
+    <file src="$windows_net472_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/net472" />
 
-    <!-- Windows Classic Desktop (WPF and WinForms) for .NETFramework 471 -->
-    <file src="$windows_desktop_net472_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/net472" />
-    <file src="$windows_desktop_net472_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/net472" />
+    <!-- Windows Desktop for .NET Core and .NET 5 with old OS targets -->
+    <file src="$windows_netcore_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/netcoreapp3.1" />
+    <file src="$windows_netcore_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/netcoreapp3.1" />
 
-    <!-- WindowsDesktop (WPF and WinForms) for .NET Core -->
-    <file src="$windows_desktop_netcore_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/netcoreapp3.1" />
-    <file src="$windows_desktop_netcore_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/netcoreapp3.1" />
-    <file src="$windows_desktop_net5_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/net5.0-windows7.0" />
-    <file src="$windows_desktop_net5_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/net5.0-windows7.0" />
-        
-    <!-- WinUI -->
-    <file src="$windows_desktop_net5_winui_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/net5.0-windows10.0.17763.0" />
-    <file src="$windows_desktop_net5_winui_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/net5.0-windows10.0.17763.0" />
+    <!-- Windows Desktop for WinUI and modern OS targets -->
+    <file src="$windows_net5_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/net5.0-windows10.0.17763.0" />
+    <file src="$windows_net5_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/net5.0-windows10.0.17763.0" />
   </files>
 </package>
diff --git a/nuget/WindowsAppCenterCrashes.nuspec b/nuget/WindowsAppCenterCrashes.nuspec
index f16caf0e7..666198fee 100644
--- a/nuget/WindowsAppCenterCrashes.nuspec
+++ b/nuget/WindowsAppCenterCrashes.nuspec
@@ -30,22 +30,18 @@
     <file src="$uwp_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/uap10.0" />
     <file src="$uwp_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/uap10.0" />
 
-    <!-- WindowsDesktop (WPF and WinForms) for .NET framework -->
-    <file src="$windows_desktop_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/net461" />
-    <file src="$windows_desktop_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/net461" />
+    <!-- Windows Classic Desktop (WPF and WinForms) for .NET Framework -->
+    <file src="$windows_net461_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/net461" />
+    <file src="$windows_net461_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/net461" />
+    <file src="$windows_net472_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/net472" />
+    <file src="$windows_net472_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/net472" />
 
-    <!-- Windows Classic Desktop (WPF and WinForms) for .NETFramework 471 -->
-    <file src="$windows_desktop_net472_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/net472" />
-    <file src="$windows_desktop_net472_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/net472" />
+    <!-- Windows Desktop for .NET Core and .NET 5 with old OS targets -->
+    <file src="$windows_netcore_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/netcoreapp3.1" />
+    <file src="$windows_netcore_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/netcoreapp3.1" />
 
-    <!-- WindowsDesktop (WPF and WinForms) for .NET Core -->
-    <file src="$windows_desktop_netcore_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/netcoreapp3.1" />
-    <file src="$windows_desktop_netcore_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/netcoreapp3.1" />
-    <file src="$windows_desktop_net5_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/net5.0-windows7.0" />
-    <file src="$windows_desktop_net5_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/net5.0-windows7.0" />
-
-    <!-- WinUI -->
-    <file src="$windows_desktop_net5_winui_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/net5.0-windows10.0.17763.0" />
-    <file src="$windows_desktop_net5_winui_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/net5.0-windows10.0.17763.0" />
+    <!-- Windows Desktop for WinUI and modern OS targets -->
+    <file src="$windows_net5_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/net5.0-windows10.0.17763.0" />
+    <file src="$windows_net5_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/net5.0-windows10.0.17763.0" />
   </files>
 </package>
diff --git a/scripts/configuration/ac-build-config.xml b/scripts/configuration/ac-build-config.xml
index c4c89c355..98f08fa83 100644
--- a/scripts/configuration/ac-build-config.xml
+++ b/scripts/configuration/ac-build-config.xml
@@ -46,31 +46,26 @@
         <assembly path="SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes/bin/Release/netstandard1.0/Microsoft.AppCenter.Crashes.dll"/>
         <assembly path="SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute/bin/Release/netstandard1.0/Microsoft.AppCenter.Distribute.dll"/>
     </group>
-    <group id="windows_desktop" buildGroup="windows">
+    <group id="windows_net461" buildGroup="windows">
         <assembly path="SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/bin/Release/net461/Microsoft.AppCenter.dll"/>
         <assembly path="SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.WindowsDesktop/bin/Release/net461/Microsoft.AppCenter.Analytics.dll"/>
         <assembly path="SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.WindowsDesktop/bin/Release/net461/Microsoft.AppCenter.Crashes.dll"/>
     </group>
-    <group id="windows_desktop_net472" buildGroup="windows">
+    <group id="windows_net472" buildGroup="windows">
         <assembly path="SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/bin/Release/net472/Microsoft.AppCenter.dll"/>
         <assembly path="SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.WindowsDesktop/bin/Release/net472/Microsoft.AppCenter.Analytics.dll"/>
         <assembly path="SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.WindowsDesktop/bin/Release/net472/Microsoft.AppCenter.Crashes.dll"/>
     </group>
-    <group id="windows_desktop_netcore" buildGroup="windows">
+    <group id="windows_netcore" buildGroup="windows">
         <assembly path="SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/bin/Release/netcoreapp3.1/Microsoft.AppCenter.dll"/>
         <assembly path="SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.WindowsDesktop/bin/Release/netcoreapp3.1/Microsoft.AppCenter.Analytics.dll"/>
         <assembly path="SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.WindowsDesktop/bin/Release/netcoreapp3.1/Microsoft.AppCenter.Crashes.dll"/>
     </group>
-    <group id="windows_desktop_net5_winui" buildGroup="windows">
+    <group id="windows_net5" buildGroup="windows">
         <assembly path="SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/bin/Release/net5.0-windows10.0.17763.0/Microsoft.AppCenter.dll"/>
         <assembly path="SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.WindowsDesktop/bin/Release/net5.0-windows10.0.17763.0/Microsoft.AppCenter.Analytics.dll"/>
         <assembly path="SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.WindowsDesktop/bin/Release/net5.0-windows10.0.17763.0/Microsoft.AppCenter.Crashes.dll"/>
     </group>
-    <group id="windows_desktop_net5" buildGroup="windows">
-        <assembly path="SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/bin/Release/net5.0-windows/Microsoft.AppCenter.dll"/>
-        <assembly path="SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.WindowsDesktop/bin/Release/net5.0-windows/Microsoft.AppCenter.Analytics.dll"/>
-        <assembly path="SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.WindowsDesktop/bin/Release/net5.0-windows/Microsoft.AppCenter.Crashes.dll"/>
-    </group>
     <group id="uwp" buildGroup="windows">
         <assembly path="SDK/AppCenter/Microsoft.AppCenter.UWP/bin/Release/uap10.0.16299/Microsoft.AppCenter.dll"/>
         <assembly path="SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.UWP/bin/Release/uap10.0.16299/Microsoft.AppCenter.Analytics.dll"/>