From 191cc33e74ec118ba6e5b12bd91a8d938244fabc Mon Sep 17 00:00:00 2001
From: Quajak <jasper.gerigk@gmx.net>
Date: Sun, 23 May 2021 11:30:37 +0200
Subject: [PATCH] trying to merge

---
 build/Targets/MSBuildExtension.targets |  4 ++--
 build/Targets/NETFramework.targets     |  2 +-
 build/Targets/PackageVersions.targets  | 21 ++++++++++++++++++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/build/Targets/MSBuildExtension.targets b/build/Targets/MSBuildExtension.targets
index 4e3f7da98a..afd1c067e1 100644
--- a/build/Targets/MSBuildExtension.targets
+++ b/build/Targets/MSBuildExtension.targets
@@ -1,8 +1,8 @@
 <Project>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Build.Framework" Version="16.9.0" PrivateAssets="All" ExcludeAssets="Runtime" />
-        <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.9.0" PrivateAssets="All" ExcludeAssets="Runtime" />
+        <PackageReference Include="Microsoft.Build.Framework" PrivateAssets="All" ExcludeAssets="Runtime" />
+        <PackageReference Include="Microsoft.Build.Utilities.Core" PrivateAssets="All" ExcludeAssets="Runtime" />
     </ItemGroup>
 
 </Project>
diff --git a/build/Targets/NETFramework.targets b/build/Targets/NETFramework.targets
index efe2af6607..914b42e54d 100644
--- a/build/Targets/NETFramework.targets
+++ b/build/Targets/NETFramework.targets
@@ -1,7 +1,7 @@
 <Project>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
     </ItemGroup>
 
 </Project>
diff --git a/build/Targets/PackageVersions.targets b/build/Targets/PackageVersions.targets
index 7979f5f679..486b901551 100644
--- a/build/Targets/PackageVersions.targets
+++ b/build/Targets/PackageVersions.targets
@@ -3,7 +3,15 @@
     <PropertyGroup>
         <ApprovalTestsVersion>3.0.18</ApprovalTestsVersion>
         <AvaloniaVersion>0.7.0</AvaloniaVersion>
-        <NuGetVersion>5.9.1</NuGetVersion>
+        <MicrosoftBuildVersion>15.9.20</MicrosoftBuildVersion>
+        <MicrosoftNETFrameworkReferenceAssembliesVersion>1.0.0-alpha-004</MicrosoftNETFrameworkReferenceAssembliesVersion>
+        <MicrosoftNETTestSdkVersion>15.9.0</MicrosoftNETTestSdkVersion>
+        <MicrosoftTestPlatformObjectModelVersion>15.9.0</MicrosoftTestPlatformObjectModelVersion>
+        <MicrosoftVisualStudioSDKEmbedInteropTypesVersion>15.0.27</MicrosoftVisualStudioSDKEmbedInteropTypesVersion>
+        <MicrosoftVisualStudioSetupConfigurationInteropVersion>1.16.30</MicrosoftVisualStudioSetupConfigurationInteropVersion>
+        <MicrosoftVSSDKBuildToolsVersion>16.8.3038</MicrosoftVSSDKBuildToolsVersion>
+        <MSTestVersion>1.4.0</MSTestVersion>
+        <NuGetVersion>4.8.0</NuGetVersion>
         <NUnitVersion>3.11.0</NUnitVersion>
         <NUnit3TestAdapterVersion>3.12.0</NUnit3TestAdapterVersion>
         <RoslynAnalyzersVersion>2.6.2</RoslynAnalyzersVersion>
@@ -14,6 +22,17 @@
         <PackageReference Update="ApprovalUtilities" Version="$(ApprovalTestsVersion)" />
         <PackageReference Update="Avalonia" Version="$(AvaloniaVersion)" />
         <PackageReference Update="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+        <PackageReference Update="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
+        <PackageReference Update="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
+        <PackageReference Update="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
+        <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssembliesVersion)" />
+        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
+        <PackageReference Update="Microsoft.TestPlatform.ObjectModel" Version="$(MicrosoftTestPlatformObjectModelVersion)" />
+        <PackageReference Update="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="$(MicrosoftVisualStudioSDKEmbedInteropTypesVersion)" />
+        <PackageReference Update="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
+        <PackageReference Update="Microsoft.VSSDK.BuildTools" Version="$(MicrosoftVSSDKBuildToolsVersion)" />
+        <PackageReference Update="MSTest.TestAdapter" Version="$(MSTestVersion)" />
+        <PackageReference Update="MSTest.TestFramework" Version="$(MSTestVersion)" />
         <PackageReference Update="NuGet.Common" Version="$(NuGetVersion)" />
         <PackageReference Update="NuGet.Configuration" Version="$(NuGetVersion)" />
         <PackageReference Update="NUnit" Version="$(NUnitVersion)" />