Skip to content

Commit

Permalink
Feature: bumping .NET Framework version to 4.6.2 (#1856)
Browse files Browse the repository at this point in the history
* Feature: bumping .NET Framework version to 4.6.2

* Added changelog entry
  • Loading branch information
gautamdsheth committed May 22, 2022
1 parent fb538c0 commit 45aa92d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

### Changed
- Changed `Sync-PnPSharePointUserProfilesFromAzureActiveDirectory` to map users based on their Ids instead which should resolve some issues around user identities reporting not to exist. You can use the new `-IdType` option to switch it back to `PrincipalName` if needed. [#1752](https://github.com/pnp/powershell/pull/1752)
- Bumped .NET Framework version to 4.6.2 as the 4.6.1 is not supported anymore. [#1856](https://github.com/pnp/powershell/pull/1856)

### Fixed

Expand Down
6 changes: 3 additions & 3 deletions src/Commands/PnP.PowerShell.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<DefineConstants>Linux</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
<PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
<DefineConstants>TRACE;$(DefineConstants);NETFRAMEWORK</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
Expand Down Expand Up @@ -133,11 +133,11 @@
<PackageReference Include="NewtonSoft.Json" Version="12.0.3" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<PackageReference Include="Microsoft.PowerShell.5.ReferenceAssemblies" Version="1.1.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<Compile Remove="Base\DependencyAssemblyLoadContext.cs" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Commands/WindowsSdk.targets
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<Sdk Name="Microsoft.NET.Sdk.WindowsDesktop" />
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net462</TargetFrameworks>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>
</Project>

0 comments on commit 45aa92d

Please sign in to comment.