From 4b1c58a0ee196b6f12ea172f1df252d9bcc3b972 Mon Sep 17 00:00:00 2001
From: Neha Bhargava <61847233+neha-bhargava@users.noreply.github.com>
Date: Thu, 26 Oct 2023 16:39:04 -0700
Subject: [PATCH] Bump Net461 to Net462 (#4367)
* Bump Net461 to Net462
* Update PublicClientApplicationBuilder.cs
* Address comments
* Bump broker and desktop projects to 462 as well
---
build/platform_and_feature_flags.props | 4 ++--
.../Microsoft.Identity.Client.Broker.csproj | 2 +-
.../Microsoft.Identity.Client.Desktop.csproj | 2 +-
.../AppConfig/PublicClientApplicationBuilder.cs | 2 +-
.../Microsoft.Identity.Client.csproj | 12 ++++++------
.../Microsoft.Identity.Test.Integration.Win8.csproj | 8 ++++----
.../Microsoft.Identity.Test.Unit.csproj | 12 ++++++------
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/build/platform_and_feature_flags.props b/build/platform_and_feature_flags.props
index 86e90fc125..82f4c13a93 100644
--- a/build/platform_and_feature_flags.props
+++ b/build/platform_and_feature_flags.props
@@ -14,10 +14,10 @@
$(DefineConstants);ANDROID;SUPPORTS_BROKER;IS_XAMARIN_OR_UWP
-
+
$(DefineConstants);DESKTOP;SUPPORTS_CONFIDENTIAL_CLIENT;SUPPORTS_CUSTOM_CACHE;SUPPORTS_WIN32;
-
+
$(DefineConstants);SUPPORTS_BROKER
diff --git a/src/client/Microsoft.Identity.Client.Broker/Microsoft.Identity.Client.Broker.csproj b/src/client/Microsoft.Identity.Client.Broker/Microsoft.Identity.Client.Broker.csproj
index 7cb99a3ce1..0901e06361 100644
--- a/src/client/Microsoft.Identity.Client.Broker/Microsoft.Identity.Client.Broker.csproj
+++ b/src/client/Microsoft.Identity.Client.Broker/Microsoft.Identity.Client.Broker.csproj
@@ -2,7 +2,7 @@
netstandard2.0
- net461
+ net462
8.0
AnyCPU
diff --git a/src/client/Microsoft.Identity.Client.Desktop/Microsoft.Identity.Client.Desktop.csproj b/src/client/Microsoft.Identity.Client.Desktop/Microsoft.Identity.Client.Desktop.csproj
index 870c8847f5..7c1a2de89c 100644
--- a/src/client/Microsoft.Identity.Client.Desktop/Microsoft.Identity.Client.Desktop.csproj
+++ b/src/client/Microsoft.Identity.Client.Desktop/Microsoft.Identity.Client.Desktop.csproj
@@ -1,7 +1,7 @@
- net461
+ net462
netcoreapp3.1
$(TargetFrameworkNetDesktop);$(TargetFrameworkNetCore)
diff --git a/src/client/Microsoft.Identity.Client/AppConfig/PublicClientApplicationBuilder.cs b/src/client/Microsoft.Identity.Client/AppConfig/PublicClientApplicationBuilder.cs
index 0fdacfaa43..830de4a241 100644
--- a/src/client/Microsoft.Identity.Client/AppConfig/PublicClientApplicationBuilder.cs
+++ b/src/client/Microsoft.Identity.Client/AppConfig/PublicClientApplicationBuilder.cs
@@ -164,7 +164,7 @@ public PublicClientApplicationBuilder WithBroker(bool enableBroker = true)
"The Windows broker is not available on .NET Framework 4.5, use at least .NET Framework 4.6.2");
#endif
-#if NET461
+#if NET462
if (Config.BrokerCreatorFunc == null)
{
throw new PlatformNotSupportedException(
diff --git a/src/client/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj b/src/client/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj
index 2949cce092..33e850f671 100644
--- a/src/client/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj
+++ b/src/client/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj
@@ -1,7 +1,7 @@
- net461
+ net462
netstandard2.0
net6.0
net6.0-windows
@@ -29,14 +29,14 @@
- $(TargetFrameworkNetDesktop45);$(TargetFrameworkNetDesktop461);$(TargetFrameworkNetStandard);$(TargetFrameworkUap);$(TargetFrameworkIos);$(TargetFrameworkAndroid9);$(TargetFrameworkAndroid10);$(TargetFrameworkNet6Ios);$(TargetFrameworkNet6Android);$(TargetFrameworkNet6Mac);$(TargetFrameworkNet6);$(TargetFrameworkNet6Win);
+ $(TargetFrameworkNetDesktop45);$(TargetFrameworkNetDesktop462);$(TargetFrameworkNetStandard);$(TargetFrameworkUap);$(TargetFrameworkIos);$(TargetFrameworkAndroid9);$(TargetFrameworkAndroid10);$(TargetFrameworkNet6Ios);$(TargetFrameworkNet6Android);$(TargetFrameworkNet6Mac);$(TargetFrameworkNet6);$(TargetFrameworkNet6Win);
$(TargetFrameworkNetStandard);$(TargetFrameworkIos);$(TargetFrameworkAndroid9);$(TargetFrameworkAndroid10);$(TargetFrameworkNet6Ios);$(TargetFrameworkNet6Android);$(TargetFrameworkNet6Mac);$(TargetFrameworkNet6)
$(TargetFrameworkNetStandard);$(TargetFrameworkNet6)
- $(TargetFrameworkNetDesktop461);$(TargetFrameworkNetStandard);$(TargetFrameworkNet6);
+ $(TargetFrameworkNetDesktop462);$(TargetFrameworkNetStandard);$(TargetFrameworkNet6);
@@ -88,7 +88,7 @@
v10.0
-
+
$(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)
true
@@ -169,14 +169,14 @@
7.0
-
+
-
+
diff --git a/tests/Microsoft.Identity.Test.Integration.Win8/Microsoft.Identity.Test.Integration.Win8.csproj b/tests/Microsoft.Identity.Test.Integration.Win8/Microsoft.Identity.Test.Integration.Win8.csproj
index 44d666fb5a..1e1c7e4704 100644
--- a/tests/Microsoft.Identity.Test.Integration.Win8/Microsoft.Identity.Test.Integration.Win8.csproj
+++ b/tests/Microsoft.Identity.Test.Integration.Win8/Microsoft.Identity.Test.Integration.Win8.csproj
@@ -1,10 +1,10 @@
- net48
+ net48
net6.0-windows10.0.17763.0
- $(TargetFrameworkNetDesktop461);$(TargetFrameworkNetCore);$(TargetFrameworkNet6Win)
+ $(TargetFrameworkNetDesktop48);$(TargetFrameworkNetCore);$(TargetFrameworkNet6Win)
false
Debug;Release;Debug + MobileApps
@@ -30,13 +30,13 @@
-
+
-
+
$(DefineConstants);DESKTOP
diff --git a/tests/Microsoft.Identity.Test.Unit/Microsoft.Identity.Test.Unit.csproj b/tests/Microsoft.Identity.Test.Unit/Microsoft.Identity.Test.Unit.csproj
index 70e95cdc7d..0dbf888a13 100644
--- a/tests/Microsoft.Identity.Test.Unit/Microsoft.Identity.Test.Unit.csproj
+++ b/tests/Microsoft.Identity.Test.Unit/Microsoft.Identity.Test.Unit.csproj
@@ -1,11 +1,11 @@
- net48
+ net48
net6.0
net6.0-windows
- $(TargetFrameworkNetDesktop461);$(TargetFrameworkNet6);$(TargetFrameworkNet6Win)
+ $(TargetFrameworkNetDesktop48);$(TargetFrameworkNet6);$(TargetFrameworkNet6Win)
false
latest
@@ -18,7 +18,7 @@
+ Condition="'$(TargetFramework)' == '$(TargetFrameworkNetDesktop48)'" />
{3433eb33-114a-4db7-bc57-14f17f55da3c}
@@ -64,11 +64,11 @@
-
+
-
+
@@ -79,7 +79,7 @@
$(DefineConstants);NET_CORE
-
+
$(DefineConstants);DESKTOP