Trimming out classic xamarin targets

shinyorg · Mar 16, 2024 · 532fb23 · 532fb23
1 parent 1bf5041
commit 532fb23
Show file tree

Hide file tree

Showing 24 changed files with 5 additions and 140 deletions.
diff --git a/Shiny.sln b/Shiny.sln
@@ -23,7 +23,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{6374E4D9-1
 	ProjectSection(SolutionItems) = preProject
 		src\Directory.build.props = src\Directory.build.props
 		src\Directory.build.targets = src\Directory.build.targets
-		src\global.json = src\global.json
 		src\nuget.png = src\nuget.png
 		src\nuget.txt = src\nuget.txt
 		version.json = version.json

diff --git a/build.ps1 b/build.ps1
diff --git a/build.sh b/build.sh
diff --git a/src/Directory.build.props b/src/Directory.build.props
@@ -20,30 +20,20 @@
         <CI Condition="'$(GITHUB_ACTIONS)' == 'true'">true</CI>
         <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
         <MicrosoftExtensionsVersion>8.0.0</MicrosoftExtensionsVersion>
-        <MauiVersion>8.0.6</MauiVersion>
+        <MauiVersion>8.0.3</MauiVersion>
     </PropertyGroup>
 
     <PropertyGroup>
-        <UseMSBuild Condition="$([MSBuild]::IsOSPlatform('windows'))">true</UseMSBuild>
         <WindowsTarget Condition="$([MSBuild]::IsOSPlatform('windows'))">net8.0-windows10.0.19041.0</WindowsTarget>
-        <!--<UseMSBuild>false</UseMSBuild>-->
-
         <StandardTargetFrameworks>net8.0</StandardTargetFrameworks>
-        <StandardTargetFrameworks Condition="'$(CI)' == 'true'">$(StandardTargetFrameworks);netstandard2.1</StandardTargetFrameworks>
-
         <IosTargetFrameworks>net8.0-ios</IosTargetFrameworks>
-        <IosTargetFrameworks Condition="'$(UseMSBuild)' == 'true'">$(IosTargetFrameworks);xamarin.ios10</IosTargetFrameworks>
-
         <AndroidTargetFrameworks>net8.0-android</AndroidTargetFrameworks>
-        <AndroidTargetFrameworks Condition="'$(UseMSBuild)' == 'true'">$(AndroidTargetFrameworks);monoandroid13.0</AndroidTargetFrameworks>
 
         <MauiPlatformTargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</MauiPlatformTargetFrameworks>
         <AppleTargetFrameworks>$(IosTargetFrameworks);net8.0-maccatalyst</AppleTargetFrameworks>
         <PlatformOnlyTargetFrameworks>$(AppleTargetFrameworks);$(AndroidTargetFrameworks)</PlatformOnlyTargetFrameworks>
         <DefaultMobileTargetFrameworks>$(StandardTargetFrameworks);$(IosTargetFrameworks);$(AndroidTargetFrameworks)</DefaultMobileTargetFrameworks>
         <DefaultTargetFrameworks>$(StandardTargetFrameworks);$(PlatformOnlyTargetFrameworks)</DefaultTargetFrameworks>
-
-        <MSBuildSdkExtrasVersion>3.0.44</MSBuildSdkExtrasVersion>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)' == 'Release'">
@@ -55,16 +45,6 @@
         <EmbedUntrackedSources>True</EmbedUntrackedSources>
     </PropertyGroup>
 
-    <PropertyGroup Condition="$(TargetFramework.Contains('netstandard'))">
-        <IsClassicTarget>true</IsClassicTarget>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="$(TargetFramework.Contains('monoandroid'))">
-        <IsAndroidBuild>true</IsAndroidBuild>
-        <IsClassicTarget>true</IsClassicTarget>
-        <DefineConstants>$(DefineConstants);XAMARIN</DefineConstants>
-    </PropertyGroup>
-
     <PropertyGroup Condition="$(TargetFramework.Contains('-android'))">
         <SupportedOSPlatformVersion>26.0</SupportedOSPlatformVersion>
         <TargetPlatformMinVersion>34.0</TargetPlatformMinVersion>
@@ -77,12 +57,6 @@
         <DefineConstants>$(DefineConstants);ANDROID;PLATFORM</DefineConstants>
     </PropertyGroup>
 
-    <PropertyGroup Condition="$(TargetFramework.Contains('xamarin.ios'))">
-        <IsIosBuild>true</IsIosBuild>
-        <IsClassicTarget>true</IsClassicTarget>
-        <DefineConstants>$(DefineConstants);IOS;APPLE;PLATFORM;XAMARIN</DefineConstants>
-    </PropertyGroup>
-
     <PropertyGroup Condition="$(TargetFramework.Contains('-ios'))">
         <SupportedOSPlatformVersion>14.0</SupportedOSPlatformVersion>
         <IsIosBuild>true</IsIosBuild>

diff --git a/src/Directory.build.targets b/src/Directory.build.targets
@@ -13,15 +13,6 @@
         <None Include="..\..\readme.md" Pack="true" PackagePath="\" />
     </ItemGroup>
 
-    <ItemGroup Condition="$(TargetFramework.Contains('netstandard'))">
-        <Compile Include="Platforms\NetStandard\**\*.cs" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(IsClassicTarget)' == 'true'">
-        <Compile Include="$(MSBuildThisFileDirectory)IsExternalInit.cs" />
-        <!--<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />-->
-    </ItemGroup>
-
     <ItemGroup Condition="'$(IsAndroidBuild)' == 'true'">
         <Compile Include="Platforms\Android\**\*.cs" />
         <Compile Include="Platforms\Shared\**\*.cs" />

diff --git a/src/IsExternalInit.cs b/src/IsExternalInit.cs
diff --git a/src/Shiny.Beacons/Shiny.Beacons.csproj b/src/Shiny.Beacons/Shiny.Beacons.csproj
@@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
-
     <PropertyGroup>
         <TargetFrameworks>$(DefaultTargetFrameworks)</TargetFrameworks>
         <Description>Shiny Beacons - for those Shiny BLE things you see everywhere</Description>
@@ -15,6 +13,4 @@
     <ItemGroup Condition="'$(IsAndroidBuild)' == 'true'">
         <ProjectReference Include="..\Shiny.BluetoothLE\Shiny.BluetoothLE.csproj" />
     </ItemGroup>
-
-    <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
 </Project>
diff --git a/src/Shiny.BluetoothLE.Common/Shiny.BluetoothLE.Common.csproj b/src/Shiny.BluetoothLE.Common/Shiny.BluetoothLE.Common.csproj
@@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
-
     <PropertyGroup>
         <TargetFrameworks>$(DefaultTargetFrameworks)</TargetFrameworks>
         <Description>Shiny BluetoothLE - Common components for Hosting and Client</Description>
@@ -9,6 +7,4 @@
     <ItemGroup>
         <ProjectReference Include="..\Shiny.Core\Shiny.Core.csproj" />
     </ItemGroup>
-
-    <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
 </Project>
diff --git a/src/Shiny.BluetoothLE.Hosting/Shiny.BluetoothLE.Hosting.csproj b/src/Shiny.BluetoothLE.Hosting/Shiny.BluetoothLE.Hosting.csproj
@@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
-
     <PropertyGroup>
         <TargetFrameworks>$(DefaultTargetFrameworks)</TargetFrameworks>
         <Description>Shiny BluetoothLE Hosting - Advertising and GATT server functionality</Description>
@@ -10,6 +8,4 @@
         <ProjectReference Include="..\Shiny.Core\Shiny.Core.csproj" />
         <ProjectReference Include="..\Shiny.BluetoothLE.Common\Shiny.BluetoothLE.Common.csproj" />
     </ItemGroup>
-
-    <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
 </Project>
diff --git a/src/Shiny.BluetoothLE/Shiny.BluetoothLE.csproj b/src/Shiny.BluetoothLE/Shiny.BluetoothLE.csproj
@@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
-
     <PropertyGroup>
         <TargetFrameworks>$(DefaultTargetFrameworks);$(WindowsTarget)</TargetFrameworks>
         <Description>Shiny Reactive BluetoothLE Plugin for client/central operations</Description>
@@ -10,6 +8,4 @@
         <ProjectReference Include="..\Shiny.Core\Shiny.Core.csproj" />
         <ProjectReference Include="..\Shiny.BluetoothLE.Common\Shiny.BluetoothLE.Common.csproj" />
     </ItemGroup>
-
-    <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
 </Project>
diff --git a/src/Shiny.Extensions.Configuration/Shiny.Extensions.Configuration.csproj b/src/Shiny.Extensions.Configuration/Shiny.Extensions.Configuration.csproj
@@ -1,17 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
-
 	<PropertyGroup>
         <TargetFrameworks>$(PlatformOnlyTargetFrameworks)</TargetFrameworks>
         <Description>Xamarin Configuration Sources (Android/iOS) for Microsoft.Extensions.Configuration</Description>
 	</PropertyGroup>
 
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-	  <CreatePackage>false</CreatePackage>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-	  <CreatePackage>false</CreatePackage>
-	</PropertyGroup>
     <ItemGroup>
         <None Include="Platforms\**\*.cs" />
 		<Compile Remove="Platforms\**\*.cs" />
@@ -22,6 +14,4 @@
     <ItemGroup Condition="'$(IsAndroidBuild)' == 'true'">
 		<PackageReference Include="Xamarin.AndroidX.Preference" Version="1.2.1.1" />
     </ItemGroup>
-
-    <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
-</Project>
+</Project>
diff --git a/src/Shiny.Hosting.Native/Shiny.Hosting.Native.csproj b/src/Shiny.Hosting.Native/Shiny.Hosting.Native.csproj
@@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
-
     <PropertyGroup>
         <TargetFrameworks>$(DefaultTargetFrameworks)</TargetFrameworks>
     </PropertyGroup>
@@ -13,6 +11,4 @@
     <ItemGroup Condition="$(TargetFramework.Contains('android'))">
         <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.6.1" />
     </ItemGroup>
-
-    <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
 </Project>
diff --git a/src/Shiny.Jobs/Shiny.Jobs.csproj b/src/Shiny.Jobs/Shiny.Jobs.csproj
@@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
-
     <PropertyGroup>
         <TargetFrameworks>$(DefaultTargetFrameworks)</TargetFrameworks>
         <Description>Shiny Background Jobs</Description>
@@ -15,6 +13,4 @@
     <ItemGroup Condition="'$(IsAndroidBuild)' == 'true'">
         <PackageReference Include="Xamarin.AndroidX.Work.Runtime" Version="2.7.1.4" />
     </ItemGroup>
-
-    <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
-</Project>
+</Project>
diff --git a/src/Shiny.Locations/Shiny.Locations.csproj b/src/Shiny.Locations/Shiny.Locations.csproj
@@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
-
     <PropertyGroup>
         <TargetFrameworks>$(DefaultTargetFrameworks)</TargetFrameworks>
         <Description>Shiny Locations - bringing geofencing and GPS to a background service near you!</Description>
@@ -15,6 +13,4 @@
     <ItemGroup Condition="'$(IsAndroidBuild)' == 'true'">
         <PackageReference Include="Xamarin.GooglePlayServices.Location" Version="121.0.1.1" />
     </ItemGroup>
-
-    <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
-</Project>
+</Project>
diff --git a/src/Shiny.Net.Http/Shiny.Net.Http.csproj b/src/Shiny.Net.Http/Shiny.Net.Http.csproj
@@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
-
     <PropertyGroup>
         <TargetFrameworks>$(DefaultTargetFrameworks)</TargetFrameworks>
         <Description>Shiny addon for adding upload and download management to your app (with metrics!)</Description>
@@ -11,6 +9,4 @@
         <ProjectReference Include="..\Shiny.Support.DeviceMonitoring\Shiny.Support.DeviceMonitoring.csproj" />
         <ProjectReference Include="..\Shiny.Support.Repositories\Shiny.Support.Repositories.csproj" />
     </ItemGroup>
-
-    <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
 </Project>
diff --git a/src/Shiny.Notifications/Shiny.Notifications.csproj b/src/Shiny.Notifications/Shiny.Notifications.csproj
@@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
-
     <PropertyGroup>
         <TargetFrameworks>$(DefaultTargetFrameworks)</TargetFrameworks>
         <Description>Shiny addon for all your notification needs</Description>
@@ -16,6 +14,4 @@
         <ProjectReference Include="..\Shiny.Locations\Shiny.Locations.csproj" />
         <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.6.1.4" />
     </ItemGroup>
-
-    <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
 </Project>
diff --git a/src/Shiny.Push.AzureNotificationHubs/Shiny.Push.AzureNotificationHubs.csproj b/src/Shiny.Push.AzureNotificationHubs/Shiny.Push.AzureNotificationHubs.csproj
@@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
-
     <PropertyGroup>
         <TargetFrameworks>$(DefaultTargetFrameworks)</TargetFrameworks>
         <Description>Shiny Push Integration - Microsoft Azure Notification Hubs</Description>
@@ -10,6 +8,4 @@
         <PackageReference Include="Microsoft.Azure.NotificationHubs" Version="4.2.0" />
         <ProjectReference Include="..\Shiny.Push\Shiny.Push.csproj" />
     </ItemGroup>
-
-    <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
 </Project>
diff --git a/src/Shiny.Push.FirebaseMessaging/Shiny.Push.FirebaseMessaging.csproj b/src/Shiny.Push.FirebaseMessaging/Shiny.Push.FirebaseMessaging.csproj
@@ -1,24 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
-
     <PropertyGroup>
         <TargetFrameworks>$(IosTargetFrameworks);$(AndroidTargetFrameworks)</TargetFrameworks>
         <Description>Shiny Push Integration - Google Firebase Cloud Messaging</Description>
     </PropertyGroup>
 
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-      <CreatePackage>false</CreatePackage>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-      <CreatePackage>false</CreatePackage>
-    </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\Shiny.Push\Shiny.Push.csproj" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(IsIosBuild)' == 'true'">
         <PackageReference Include="Xamarin.Firebase.iOS.CloudMessaging" Version="8.10.0.3" />
     </ItemGroup>
-
-    <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
 </Project>
diff --git a/src/Shiny.Push/Shiny.Push.csproj b/src/Shiny.Push/Shiny.Push.csproj
@@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
-
     <PropertyGroup>
         <TargetFrameworks>$(DefaultTargetFrameworks)</TargetFrameworks>
         <Description>Shiny addon for all your push notification needs</Description>
@@ -13,6 +11,4 @@
     <ItemGroup Condition="'$(IsAndroidBuild)' == 'true'">
         <PackageReference Include="Xamarin.Firebase.Messaging" Version="123.1.2.2" />
     </ItemGroup>
-
-    <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
 </Project>
diff --git a/src/Shiny.Support.DeviceMonitoring/Shiny.Support.DeviceMonitoring.csproj b/src/Shiny.Support.DeviceMonitoring/Shiny.Support.DeviceMonitoring.csproj
@@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
-
     <PropertyGroup>
         <TargetFrameworks>$(DefaultTargetFrameworks);$(WindowsTarget)</TargetFrameworks>
         <Description>Shiny Support Library for connectivity and battery</Description>
@@ -9,6 +7,4 @@
     <ItemGroup>
         <ProjectReference Include="..\Shiny.Core\Shiny.Core.csproj" />
     </ItemGroup>
-
-    <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
 </Project>
diff --git a/src/Shiny.Support.Locations/Shiny.Support.Locations.csproj b/src/Shiny.Support.Locations/Shiny.Support.Locations.csproj
@@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
-
     <PropertyGroup>
         <TargetFrameworks>$(DefaultTargetFrameworks)</TargetFrameworks>
         <Description>Shiny Support Library for Common Location</Description>
@@ -9,6 +7,4 @@
     <ItemGroup>
         <ProjectReference Include="..\Shiny.Core\Shiny.Core.csproj" />
     </ItemGroup>
-
-    <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
 </Project>
diff --git a/src/Shiny.Support.Repositories/Shiny.Support.Repositories.csproj b/src/Shiny.Support.Repositories/Shiny.Support.Repositories.csproj
@@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
-
     <PropertyGroup>
         <TargetFrameworks>$(DefaultTargetFrameworks)</TargetFrameworks>
         <Description>Shiny Internal Repository Library</Description>
@@ -10,6 +8,4 @@
     <ItemGroup>
         <ProjectReference Include="..\Shiny.Core\Shiny.Core.csproj" />
     </ItemGroup>
-
-    <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
 </Project>
diff --git a/src/global.json b/src/global.json
diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "3.3.0-beta.{height}",
+  "version": "4.0.0-beta.{height}",
   "assemblyVersion": {
     "precision": "revision"
   },