Merge pull request pnp#1085 from gautamdsheth/fix/remove-net6-support

Removed .NET 6 and 7 support for PnP Framework as it is out of support
gautamdsheth · Nov 9, 2024 · 5aa12ab · 5aa12ab
2 parents c774fcf + 89cedb5
commit 5aa12ab
Showing 1 changed file with 6 additions and 50 deletions.
diff --git a/src/lib/PnP.Framework/PnP.Framework.csproj b/src/lib/PnP.Framework/PnP.Framework.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
 		<LangVersion>10.0</LangVersion>
 		<RootNamespace>PnP.Framework</RootNamespace>
 		<AssemblyName>PnP.Framework</AssemblyName>
@@ -28,9 +28,7 @@
 		<IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
 		<IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
 		<!-- Set the PnPCoreSdkPath and PnPCoreSdkPathNet5 to non published PnP Core SDK binaries to load them instead of the nuget ones -->
-		<PnPCoreSdkPath Condition="'$(PnPCoreSdkPath)' == ''"></PnPCoreSdkPath>
-		<PnPCoreSdkPathNet6 Condition="'$(PnPCoreSdkPathNet6)' == ''"></PnPCoreSdkPathNet6>
-		<PnPCoreSdkPathNet7 Condition="'$(PnPCoreSdkPathNet7)' == ''"></PnPCoreSdkPathNet7>
+		<PnPCoreSdkPath Condition="'$(PnPCoreSdkPath)' == ''"></PnPCoreSdkPath>		
 		<PnPCoreSdkPathNet8 Condition="'$(PnPCoreSdkPathNet8)' == ''"></PnPCoreSdkPathNet8>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>..\pnp.core.snk</AssemblyOriginatorKeyFile>
@@ -200,33 +198,7 @@
 		<PackageReference Include="System.IO.Packaging" Version="4.7.0" />
 		<PackageReference Include="System.Text.Json" Version="4.7.2" />
 		<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
-	</ItemGroup>
-
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-		<PackageReference Include="System.Text.Json" Version="6.0.10" />
-		<PackageReference Include="Microsoft.ApplicationInsights" Version="2.18.0" />
-		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.2" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
-		<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
-		<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
-		<PackageReference Include="System.DirectoryServices" Version="6.0.0" />
-		<PackageReference Include="System.IO.Packaging" Version="6.0.0" />
-	</ItemGroup>
-
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
-		<PackageReference Include="System.Text.Json" Version="7.0.4" />
-		<PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
-		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
-		<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
-		<PackageReference Include="System.DirectoryServices" Version="7.0.1" />
-		<PackageReference Include="System.IO.Packaging" Version="7.0.0" />
-	</ItemGroup>
+	</ItemGroup>	
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
 		<PackageReference Include="System.Text.Json" Version="8.0.5" />
@@ -247,15 +219,15 @@
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.66.0" />
-		<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.66.0" />
+		<PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.66.1" />
+		<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.66.1" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
 		<PackageReference Include="AngleSharp" Version="0.17.0" />
 		<PackageReference Include="AngleSharp.Css" Version="0.17.0" />
 		<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />		
 		<PackageReference Include="Microsoft.Graph" Version="3.33.0" />
 		<PackageReference Include="Microsoft.Graph.Core" Version="1.25.1" />
-		<PackageReference Include="Microsoft.Identity.Client" Version="4.66.0" />
+		<PackageReference Include="Microsoft.Identity.Client" Version="4.66.1" />
 		<PackageReference Include="Microsoft.SharePointOnline.CSOM" Version="16.1.*" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 		<PackageReference Include="PnP.Core" Version="1.14.*-*" Condition="'$(PnPCoreSdkPath)' == ''" />
@@ -272,22 +244,6 @@
 		</Reference>
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(PnPCoreSdkPathNet6)' != ''">
-		<Reference Include="PnP.Core" Condition="'$(TargetFramework)' == 'net6.0'">
-			<HintPath>$(PnPCoreSdkPathNet6)</HintPath>
-			<Private>true</Private>
-			<SpecificVersion>false</SpecificVersion>
-		</Reference>
-	</ItemGroup>
-
-	<ItemGroup Condition="'$(PnPCoreSdkPathNet7)' != ''">
-		<Reference Include="PnP.Core" Condition="'$(TargetFramework)' == 'net7.0'">
-			<HintPath>$(PnPCoreSdkPathNet7)</HintPath>
-			<Private>true</Private>
-			<SpecificVersion>false</SpecificVersion>
-		</Reference>
-	</ItemGroup>
-
 	<ItemGroup Condition="'$(PnPCoreSdkPathNet8)' != ''">
 		<Reference Include="PnP.Core" Condition="'$(TargetFramework)' == 'net8.0'">
 			<HintPath>$(PnPCoreSdkPathNet8)</HintPath>