Skip to content

Commit 4b1c58a

Browse files
neha-bhargavaneha-bhargava
authored
Bump Net461 to Net462 (#4367)
* Bump Net461 to Net462 * Update PublicClientApplicationBuilder.cs * Address comments * Bump broker and desktop projects to 462 as well
1 parent 7d5bcce commit 4b1c58a

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

‎build/platform_and_feature_flags.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
<PropertyGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) Or '$(TargetFramework)' == '$(TargetFrameworkNet6Android)'">
1515
<DefineConstants>$(DefineConstants);ANDROID;SUPPORTS_BROKER;IS_XAMARIN_OR_UWP</DefineConstants>
1616
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(TargetFramework)' == '$(TargetFrameworkNetDesktop45)' Or '$(TargetFramework)' == '$(TargetFrameworkNetDesktop461)' ">
17+
<PropertyGroup Condition=" '$(TargetFramework)' == '$(TargetFrameworkNetDesktop45)' Or '$(TargetFramework)' == '$(TargetFrameworkNetDesktop462)' ">
1818
<DefineConstants>$(DefineConstants);DESKTOP;SUPPORTS_CONFIDENTIAL_CLIENT;SUPPORTS_CUSTOM_CACHE;SUPPORTS_WIN32;</DefineConstants>
1919
</PropertyGroup>
20-
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetDesktop461)'">
20+
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetDesktop462)'">
2121
<DefineConstants>$(DefineConstants);SUPPORTS_BROKER</DefineConstants>
2222
</PropertyGroup>
2323
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkIos)' Or '$(TargetFramework)' == '$(TargetFrameworkNet6Ios)' Or '$(TargetFramework)' == '$(TargetFrameworkNet6Mac)'">

‎src/client/Microsoft.Identity.Client.Broker/Microsoft.Identity.Client.Broker.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworkNetStandard>netstandard2.0</TargetFrameworkNetStandard>
5-
<TargetFrameworkNetDesktop Condition="$([MSBuild]::IsOsPlatform('Windows'))">net461</TargetFrameworkNetDesktop>
5+
<TargetFrameworkNetDesktop Condition="$([MSBuild]::IsOsPlatform('Windows'))">net462</TargetFrameworkNetDesktop>
66

77
<LangVersion>8.0</LangVersion>
88
<PlatformTarget>AnyCPU</PlatformTarget>

‎src/client/Microsoft.Identity.Client.Desktop/Microsoft.Identity.Client.Desktop.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
33

4-
<TargetFrameworkNetDesktop>net461</TargetFrameworkNetDesktop>
4+
<TargetFrameworkNetDesktop>net462</TargetFrameworkNetDesktop>
55
<TargetFrameworkNetCore>netcoreapp3.1</TargetFrameworkNetCore>
66
<TargetFrameworks>$(TargetFrameworkNetDesktop);$(TargetFrameworkNetCore)</TargetFrameworks>
77

‎src/client/Microsoft.Identity.Client/AppConfig/PublicClientApplicationBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public PublicClientApplicationBuilder WithBroker(bool enableBroker = true)
164164
"The Windows broker is not available on .NET Framework 4.5, use at least .NET Framework 4.6.2");
165165
#endif
166166

167-
#if NET461
167+
#if NET462
168168
if (Config.BrokerCreatorFunc == null)
169169
{
170170
throw new PlatformNotSupportedException(

‎src/client/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup Label="Targets required for unit tests to run">
4-
<TargetFrameworkNetDesktop461>net461</TargetFrameworkNetDesktop461>
4+
<TargetFrameworkNetDesktop462>net462</TargetFrameworkNetDesktop462>
55
<TargetFrameworkNetStandard>netstandard2.0</TargetFrameworkNetStandard>
66
<TargetFrameworkNet6>net6.0</TargetFrameworkNet6>
77
<TargetFrameworkNet6Win>net6.0-windows</TargetFrameworkNet6Win>
@@ -29,14 +29,14 @@
2929

3030
<!-- Package that includes all the TFMs https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/3863 -->
3131
<PropertyGroup Condition="'$(NET_ONLY_INTERNAL_PACKAGE)' == ''">
32-
<TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworkNetDesktop45);$(TargetFrameworkNetDesktop461);$(TargetFrameworkNetStandard);$(TargetFrameworkUap);$(TargetFrameworkIos);$(TargetFrameworkAndroid9);$(TargetFrameworkAndroid10);$(TargetFrameworkNet6Ios);$(TargetFrameworkNet6Android);$(TargetFrameworkNet6Mac);$(TargetFrameworkNet6);$(TargetFrameworkNet6Win);</TargetFrameworks>
32+
<TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworkNetDesktop45);$(TargetFrameworkNetDesktop462);$(TargetFrameworkNetStandard);$(TargetFrameworkUap);$(TargetFrameworkIos);$(TargetFrameworkAndroid9);$(TargetFrameworkAndroid10);$(TargetFrameworkNet6Ios);$(TargetFrameworkNet6Android);$(TargetFrameworkNet6Mac);$(TargetFrameworkNet6);$(TargetFrameworkNet6Win);</TargetFrameworks>
3333
<TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('OSX'))">$(TargetFrameworkNetStandard);$(TargetFrameworkIos);$(TargetFrameworkAndroid9);$(TargetFrameworkAndroid10);$(TargetFrameworkNet6Ios);$(TargetFrameworkNet6Android);$(TargetFrameworkNet6Mac);$(TargetFrameworkNet6)</TargetFrameworks>
3434
<TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Linux')) Or '$(NetCoreOnly)' !='' ">$(TargetFrameworkNetStandard);$(TargetFrameworkNet6)</TargetFrameworks>
3535
</PropertyGroup>
3636

3737
<!-- Package excluding Windows Desktop and Mobile TFMs https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/3863 -->
3838
<PropertyGroup Condition="'$(NET_ONLY_INTERNAL_PACKAGE)' != ''">
39-
<TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworkNetDesktop461);$(TargetFrameworkNetStandard);$(TargetFrameworkNet6);</TargetFrameworks>
39+
<TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworkNetDesktop462);$(TargetFrameworkNetStandard);$(TargetFrameworkNet6);</TargetFrameworks>
4040
</PropertyGroup>
4141

4242
<PropertyGroup Label="NuGet and AssemblyInfo metadata">
@@ -88,7 +88,7 @@
8888
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkAndroid10)'">
8989
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
9090
</PropertyGroup>
91-
<PropertyGroup Condition=" '$(TargetFramework)' == '$(TargetFrameworkNetDesktop45)' Or '$(TargetFramework)' == '$(TargetFrameworkNetDesktop461)' ">
91+
<PropertyGroup Condition=" '$(TargetFramework)' == '$(TargetFrameworkNetDesktop45)' Or '$(TargetFramework)' == '$(TargetFrameworkNetDesktop462)' ">
9292
<!-- These are for MSAL json/* build infra -->
9393
<DefineConstants>$(DefineConstants);HAVE_ADO_NET;HAVE_APP_DOMAIN;HAVE_ASYNC;HAVE_BIG_INTEGER;HAVE_BINARY_FORMATTER;HAVE_BINARY_SERIALIZATION;HAVE_BINARY_EXCEPTION_SERIALIZATION;HAVE_CHAR_TO_LOWER_WITH_CULTURE;HAVE_CHAR_TO_STRING_WITH_CULTURE;HAVE_COM_ATTRIBUTES;HAVE_COMPONENT_MODEL;HAVE_CONCURRENT_COLLECTIONS;HAVE_COVARIANT_GENERICS;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DB_NULL_TYPE_CODE;HAVE_DYNAMIC;HAVE_EMPTY_TYPES;HAVE_ENTITY_FRAMEWORK;HAVE_EXPRESSIONS;HAVE_FAST_REVERSE;HAVE_FSHARP_TYPES;HAVE_FULL_REFLECTION;HAVE_GUID_TRY_PARSE;HAVE_HASH_SET;HAVE_ICLONEABLE;HAVE_ICONVERTIBLE;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;HAVE_INOTIFY_COLLECTION_CHANGED;HAVE_INOTIFY_PROPERTY_CHANGING;HAVE_ISET;HAVE_LINQ;HAVE_MEMORY_BARRIER;HAVE_METHOD_IMPL_ATTRIBUTE;HAVE_NON_SERIALIZED_ATTRIBUTE;HAVE_READ_ONLY_COLLECTIONS;HAVE_REFLECTION_EMIT;HAVE_SECURITY_SAFE_CRITICAL_ATTRIBUTE;HAVE_SERIALIZATION_BINDER_BIND_TO_NAME;HAVE_STREAM_READER_WRITER_CLOSE;HAVE_STRING_JOIN_WITH_ENUMERABLE;HAVE_TIME_SPAN_PARSE_WITH_CULTURE;HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE;HAVE_TIME_ZONE_INFO;HAVE_TRACE_WRITER;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;HAVE_XLINQ;HAVE_XML_DOCUMENT;HAVE_XML_DOCUMENT_TYPE;HAVE_CONCURRENT_DICTIONARY;$(AdditionalConstants)</DefineConstants>
9494
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -169,14 +169,14 @@
169169
<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
170170
</PropertyGroup>
171171

172-
<ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFrameworkNetDesktop461)' ">
172+
<ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFrameworkNetDesktop462)' ">
173173
</ItemGroup>
174174

175175
<ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFrameworkNetDesktop45)' ">
176176
<Compile Remove="$(PathToMsalSources)\PlatformsCommon\Shared\CommonCryptographyManager.cs" />
177177
</ItemGroup>
178178

179-
<ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFrameworkNetDesktop45)' Or '$(TargetFramework)' == '$(TargetFrameworkNetDesktop461)' ">
179+
<ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFrameworkNetDesktop45)' Or '$(TargetFramework)' == '$(TargetFrameworkNetDesktop462)' ">
180180
<Compile Include="$(PathToMsalSources)\Platforms\netdesktop\**\*.cs" LinkBase="Platforms\netdesktop" />
181181
<Compile Include="$(PathToMsalSources)\Platforms\Features\DefaultOSBrowser\**\*.cs" />
182182
<Compile Include="$(PathToMsalSources)\Platforms\Features\WinFormsLegacyWebUi\**\*.cs" />

‎tests/Microsoft.Identity.Test.Integration.Win8/Microsoft.Identity.Test.Integration.Win8.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworkNetDesktop461>net48</TargetFrameworkNetDesktop461>
4+
<TargetFrameworkNetDesktop48>net48</TargetFrameworkNetDesktop48>
55
<TargetFrameworkNet6Win>net6.0-windows10.0.17763.0</TargetFrameworkNet6Win>
66

7-
<TargetFrameworks>$(TargetFrameworkNetDesktop461);$(TargetFrameworkNetCore);$(TargetFrameworkNet6Win)</TargetFrameworks>
7+
<TargetFrameworks>$(TargetFrameworkNetDesktop48);$(TargetFrameworkNetCore);$(TargetFrameworkNet6Win)</TargetFrameworks>
88
<IsPackable>false</IsPackable>
99
<Configurations>Debug;Release;Debug + MobileApps</Configurations>
1010
</PropertyGroup>
@@ -30,13 +30,13 @@
3030

3131
<Import Project="../../build/platform_and_feature_flags.props" />
3232

33-
<ItemGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetDesktop461)'">
33+
<ItemGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetDesktop48)'">
3434
<PackageReference Include="System.Windows.Forms" Version="4.0.0" />
3535
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
3636
<ProjectReference Include="..\..\src\client\Microsoft.Identity.Client.Broker\Microsoft.Identity.Client.Broker.csproj" />
3737
</ItemGroup>
3838

39-
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetDesktop461)' ">
39+
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetDesktop48)' ">
4040
<DefineConstants>$(DefineConstants);DESKTOP</DefineConstants>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNet6Win)' ">

‎tests/Microsoft.Identity.Test.Unit/Microsoft.Identity.Test.Unit.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworkNetDesktop461>net48</TargetFrameworkNetDesktop461>
4+
<TargetFrameworkNetDesktop48>net48</TargetFrameworkNetDesktop48>
55
<TargetFrameworkNet6>net6.0</TargetFrameworkNet6>
66
<TargetFrameworkNet6Win>net6.0-windows</TargetFrameworkNet6Win>
77

8-
<TargetFrameworks>$(TargetFrameworkNetDesktop461);$(TargetFrameworkNet6);$(TargetFrameworkNet6Win)</TargetFrameworks>
8+
<TargetFrameworks>$(TargetFrameworkNetDesktop48);$(TargetFrameworkNet6);$(TargetFrameworkNet6Win)</TargetFrameworks>
99
<IsPackable>false</IsPackable>
1010

1111
<LangVersion>latest</LangVersion>
@@ -18,7 +18,7 @@
1818

1919
<ItemGroup>
2020
<ProjectReference Include="..\..\src\client\Microsoft.Identity.Client.Broker\Microsoft.Identity.Client.Broker.csproj"
21-
Condition="'$(TargetFramework)' == '$(TargetFrameworkNetDesktop461)'" />
21+
Condition="'$(TargetFramework)' == '$(TargetFrameworkNetDesktop48)'" />
2222
<ProjectReference Include="..\..\src\client\Microsoft.Identity.Client.Extensions.Msal\Microsoft.Identity.Client.Extensions.Msal.csproj" />
2323
<ProjectReference Include="..\..\src\client\Microsoft.Identity.Client\Microsoft.Identity.Client.csproj">
2424
<Project>{3433eb33-114a-4db7-bc57-14f17f55da3c}</Project>
@@ -64,11 +64,11 @@
6464

6565
<Import Project="../../build/platform_and_feature_flags.props" />
6666

67-
<ItemGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetDesktop461)'">
67+
<ItemGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetDesktop48)'">
6868
<PackageReference Include="System.Windows.Forms" Version="4.0.0" />
6969
</ItemGroup>
7070

71-
<ItemGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetDesktop461)'">
71+
<ItemGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetDesktop48)'">
7272
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
7373
<ProjectReference Include="..\..\src\client\Microsoft.Identity.Client.Desktop\Microsoft.Identity.Client.Desktop.csproj" />
7474
</ItemGroup>
@@ -79,7 +79,7 @@
7979
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNet6)'">
8080
<DefineConstants>$(DefineConstants);NET_CORE</DefineConstants>
8181
</PropertyGroup>
82-
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetDesktop461)' ">
82+
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetDesktop48)' ">
8383
<DefineConstants>$(DefineConstants);DESKTOP</DefineConstants>
8484
</PropertyGroup>
8585
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNet6Win)'">

0 commit comments

Comments
 (0)