Update from .net472 to .net48 for vs extensions

ttessier1 · May 24, 2021 · c15ea67 · c15ea67
1 parent 191cc33
commit c15ea67
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 36 deletions.
diff --git a/Build/Targets/NETFramework.targets b/Build/Targets/NETFramework.targets
diff --git a/build/Targets/Import.targets b/build/Targets/Import.targets
@@ -7,8 +7,6 @@
     <Import Project="InternalsVisibleTo.targets" />
 
     <Import Project="PackageProperties.targets" />
-
-    <Import Project="NETFramework.targets" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
 
     <Import Project="References.targets" />
 
@@ -23,7 +21,7 @@
 
     <Import Project="Workarounds.targets" />
 
-	<Import Project="InternalPackages.targets" />
+    <Import Project="InternalPackages.targets" />
 
     <Import Project="PackageVersions.targets" />
 

diff --git a/build/Targets/MSBuildExtension.targets b/build/Targets/MSBuildExtension.targets
@@ -1,8 +1,8 @@
 <Project>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Build.Framework" PrivateAssets="All" ExcludeAssets="Runtime" />
-        <PackageReference Include="Microsoft.Build.Utilities.Core" PrivateAssets="All" ExcludeAssets="Runtime" />
+        <PackageReference Include="Microsoft.Build.Framework" PrivateAssets="All" ExcludeAssets="Runtime" Version="16.9.0" />
+        <PackageReference Include="Microsoft.Build.Utilities.Core" PrivateAssets="All" ExcludeAssets="Runtime" Version="16.9.0" />
     </ItemGroup>
 
 </Project>
diff --git a/build/Targets/PackageVersions.targets b/build/Targets/PackageVersions.targets
@@ -3,13 +3,8 @@
     <PropertyGroup>
         <ApprovalTestsVersion>3.0.18</ApprovalTestsVersion>
         <AvaloniaVersion>0.7.0</AvaloniaVersion>
-        <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>
@@ -22,15 +17,8 @@
         <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)" />

diff --git a/build/Targets/Templates.targets b/build/Targets/Templates.targets
@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <TargetFramework>netstandard1.0</TargetFramework>
+        <TargetFramework>netstandard2.0</TargetFramework>
         <PackageOutputPath>$(ArtifactsDir)packages\</PackageOutputPath>
         <NoBuild>True</NoBuild>
         <IncludeBuildOutput>False</IncludeBuildOutput>

diff --git a/source/Cosmos.Build.Tasks/Cosmos.Build.Tasks.csproj b/source/Cosmos.Build.Tasks/Cosmos.Build.Tasks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net472</TargetFramework>
+        <TargetFramework>net48</TargetFramework>
         <RuntimeIdentifier>win</RuntimeIdentifier>
         <PackageId>Cosmos.Build</PackageId>
         <PackageDescription>Cosmos build system.</PackageDescription>
@@ -37,4 +37,8 @@
     <ItemGroup>
         <ProjectReference Include="..\Cosmos.Debug.Hosts\Cosmos.Debug.Hosts.csproj" PrivateAssets="All" />
     </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
+    </ItemGroup>
 </Project>
diff --git a/source/Cosmos.Debug.HyperVServer/Cosmos.Debug.HyperVServer.csproj b/source/Cosmos.Debug.HyperVServer/Cosmos.Debug.HyperVServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net472</TargetFramework>
+        <TargetFramework>net48</TargetFramework>
         <OutputType>WinExe</OutputType>
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <LangVersion>Latest</LangVersion>

diff --git a/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj b/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net472</TargetFramework>
+        <TargetFramework>net48</TargetFramework>
         <RuntimeIdentifier>win10-x32</RuntimeIdentifier>
         <Version>1.0.0</Version>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -21,14 +21,15 @@
         <PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.15.0" Version="16.9.31023.347" />
         <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="16.9.31025.104" />
         <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.11.0" Version="16.9.31023.347" />
-        <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.9.1050">
+        <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.1600">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.0.4" />
         <PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.0.4" />
         <PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
         <PackageReference Include="Microsoft.ServiceHub.Framework" Version="2.8.2018" />
+        <PackageReference Include="System.Runtime" Version="4.3.1" />
         <PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0" />
     </ItemGroup>
 

diff --git a/source/Cosmos.VS.ProjectSystem/Cosmos.VS.ProjectSystem.csproj b/source/Cosmos.VS.ProjectSystem/Cosmos.VS.ProjectSystem.csproj
@@ -5,8 +5,7 @@
 
 
     <PropertyGroup>
-        <TargetFramework>net472</TargetFramework>
-        <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+        <TargetFramework>net48</TargetFramework>
         <RuntimeIdentifier>win10-x32</RuntimeIdentifier>
         <RootNamespace>Cosmos.VS.ProjectSystem</RootNamespace>
         <FileVersion>1.0.0.0</FileVersion>

diff --git a/source/Cosmos.VS.Windows/Cosmos.VS.Windows.csproj b/source/Cosmos.VS.Windows/Cosmos.VS.Windows.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net472</TargetFramework>
+        <TargetFramework>net48</TargetFramework>
         <RuntimeIdentifier>win10-x32</RuntimeIdentifier>
         <RootNamespace>Cosmos.VS.Windows</RootNamespace>
         <IncludeWpfReferences>True</IncludeWpfReferences>
@@ -38,10 +38,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.ServiceHub.Framework" Version="2.7.100" />
-        <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="16.7.30329.88" />
-        <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.10.0" Version="16.7.30328.74" />
-        <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.8.3038">
+        <PackageReference Include="Microsoft.ServiceHub.Framework" Version="2.8.2018" />
+        <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="16.9.31025.104" />
+        <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.10.0" Version="16.9.31023.347" />
+        <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.1600">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>