diff --git a/Directory.Build.props b/Directory.Build.props
index 89fd408123..49d2fd70f1 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -15,10 +15,7 @@
For clarity, without PrivateAssets marked here, anyone consuming Microsoft.Identity.Client
would also be forced to install these dependencies. PrivateAssets avoids this problem. -->
-
-
+
+
-
-
-
\ No newline at end of file
diff --git a/LibsAndSamples.sln b/LibsAndSamples.sln
index 4e4e8a661d..006e34d6f2 100644
--- a/LibsAndSamples.sln
+++ b/LibsAndSamples.sln
@@ -6,6 +6,9 @@ MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9B0B5396-4D95-4C15-82ED-DC22B5A3123F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Identity.Client", "src\Microsoft.Identity.Client\Microsoft.Identity.Client.csproj", "{60117A9B-4BB8-472E-BFFF-52CBF67CA95A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {A1BDB0D8-A1F8-4203-A95F-31D0ABC4DF7B} = {A1BDB0D8-A1F8-4203-A95F-31D0ABC4DF7B}
+ EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "automation", "automation", "{F578B51B-9A88-4230-A05A-DB5A23FABB07}"
EndProject
@@ -18,8 +21,14 @@ EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XForms", "tests\devapps\XForms\XForms\XForms.csproj", "{8D14A8FF-6CB9-44B1-B7C4-3C1D79CE8412}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XForms.Android", "tests\devapps\XForms\XForms.Android\XForms.Android.csproj", "{6120F6A0-59BA-4065-B0F4-92690D9BE1E2}"
+ ProjectSection(ProjectDependencies) = postProject
+ {146ECCB6-C3F1-4E97-BC52-20FEB7785C62} = {146ECCB6-C3F1-4E97-BC52-20FEB7785C62}
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XForms.iOS", "tests\devapps\XForms\XForms.iOS\XForms.iOS.csproj", "{146ECCB6-C3F1-4E97-BC52-20FEB7785C62}"
+ ProjectSection(ProjectDependencies) = postProject
+ {0B22271B-163F-429B-A472-4C7BF531CEE9} = {0B22271B-163F-429B-A472-4C7BF531CEE9}
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XForms.UWP", "tests\devapps\XForms\XForms.UWP\XForms.UWP.csproj", "{0B22271B-163F-429B-A472-4C7BF531CEE9}"
EndProject
@@ -39,6 +48,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UWP", "tests\devapps\UWP\UW
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E19B0572-BBD7-424E-81D5-E59E6884EB3A}"
ProjectSection(SolutionItems) = preProject
+ Directory.Build.props = Directory.Build.props
src\Directory.Build.targets = src\Directory.Build.targets
src\MSAL.Common.props = src\MSAL.Common.props
src\MSAL.Frameworks.props = src\MSAL.Frameworks.props
diff --git a/LibsNoSamples.sln b/LibsNoSamples.sln
index 78e62cd26c..2bb985b593 100644
--- a/LibsNoSamples.sln
+++ b/LibsNoSamples.sln
@@ -45,6 +45,9 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Identity.Test.UIAutomation.Infrastructure", "tests\Microsoft.Identity.Test.Core.UIAutomation\Microsoft.Identity.Test.UIAutomation.Infrastructure.csproj", "{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Identity.Client", "src\Microsoft.Identity.Client\Microsoft.Identity.Client.csproj", "{60117A9B-4BB8-472E-BFFF-52CBF67CA95A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {528C5488-C0D8-45C3-BEAC-3E52C22631C9} = {528C5488-C0D8-45C3-BEAC-3E52C22631C9}
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/desktop/SampleApp/App.config b/samples/desktop/SampleApp/App.config
index 49cc43e1d8..3dbff35f48 100644
--- a/samples/desktop/SampleApp/App.config
+++ b/samples/desktop/SampleApp/App.config
@@ -1,3 +1,3 @@
-
+
-
\ No newline at end of file
+
diff --git a/samples/desktop/SampleApp/Properties/Resources.Designer.cs b/samples/desktop/SampleApp/Properties/Resources.Designer.cs
index 68b021e2a8..cee8fb430d 100644
--- a/samples/desktop/SampleApp/Properties/Resources.Designer.cs
+++ b/samples/desktop/SampleApp/Properties/Resources.Designer.cs
@@ -8,10 +8,10 @@
//
//------------------------------------------------------------------------------
-namespace SampleApp.Properties
-{
-
-
+namespace SampleApp.Properties {
+ using System;
+
+
///
/// A strongly-typed resource class, for looking up localized strings, etc.
///
@@ -19,51 +19,43 @@ namespace SampleApp.Properties
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- internal class Resources
- {
-
+ internal class Resources {
+
private static global::System.Resources.ResourceManager resourceMan;
-
+
private static global::System.Globalization.CultureInfo resourceCulture;
-
+
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal Resources()
- {
+ internal Resources() {
}
-
+
///
/// Returns the cached ResourceManager instance used by this class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager
- {
- get
- {
- if ((resourceMan == null))
- {
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SampleApp.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
-
+
///
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture
- {
- get
- {
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
return resourceCulture;
}
- set
- {
+ set {
resourceCulture = value;
}
}
diff --git a/samples/desktop/SampleApp/Properties/Settings.Designer.cs b/samples/desktop/SampleApp/Properties/Settings.Designer.cs
index 50d6b99afa..9d3c33171c 100644
--- a/samples/desktop/SampleApp/Properties/Settings.Designer.cs
+++ b/samples/desktop/SampleApp/Properties/Settings.Designer.cs
@@ -8,21 +8,17 @@
//
//------------------------------------------------------------------------------
-namespace SampleApp.Properties
-{
-
-
+namespace SampleApp.Properties {
+
+
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
- {
-
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0")]
+ internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
- public static Settings Default
- {
- get
- {
+
+ public static Settings Default {
+ get {
return defaultInstance;
}
}
diff --git a/samples/desktop/SampleApp/SampleApp.csproj b/samples/desktop/SampleApp/SampleApp.csproj
index 2537d021da..cb3f6df322 100644
--- a/samples/desktop/SampleApp/SampleApp.csproj
+++ b/samples/desktop/SampleApp/SampleApp.csproj
@@ -8,8 +8,9 @@
WinExe
SampleApp
SampleApp
- v4.5.2
+ v4.6.1
512
+
AnyCPU
diff --git a/src/MSAL.Common.props b/src/MSAL.Common.props
index f0f3d5b848..eb6b09a0d5 100644
--- a/src/MSAL.Common.props
+++ b/src/MSAL.Common.props
@@ -11,6 +11,8 @@
$(MsalClientSemVer)
+ true
+
Microsoft Authentication Library for .NET
© Microsoft Corporation. All rights reserved.
@@ -62,6 +64,7 @@
Resources
Resources\Resource.designer.cs
Resource
+ v9.0
$(DefineConstants);DESKTOP
@@ -102,7 +105,7 @@
-
+
@@ -117,7 +120,7 @@
-
+
@@ -141,7 +144,7 @@
-
+
@@ -151,7 +154,7 @@
-
+
@@ -159,7 +162,7 @@
-
+
@@ -168,7 +171,7 @@
-
+
@@ -188,8 +191,8 @@
-
-
+
+
@@ -202,7 +205,7 @@
-
+
diff --git a/src/MSAL.Frameworks.props b/src/MSAL.Frameworks.props
index 7927767ea7..064eeb3e90 100644
--- a/src/MSAL.Frameworks.props
+++ b/src/MSAL.Frameworks.props
@@ -6,11 +6,11 @@
uap10.0
Xamarin.iOS10
xamarinmac20
- MonoAndroid8.1
+ MonoAndroid9.0
- $(TargetFrameworkNetDesktop);$(TargetFrameworkNetStandard);$(TargetFrameworkNetCore);$(TargetFrameworkUap);$(TargetFrameworkIos);$(TargetFrameworkAndroid);$(TargetFrameworkMac)
- $(TargetFrameworkNetStandard);$(TargetFrameworkNetCore);$(TargetFrameworkIos);$(TargetFrameworkAndroid);$(TargetFrameworkMac)
- $(TargetFrameworkNetStandard);$(TargetFrameworkNetCore);
+ $(TargetFrameworkNetDesktop);$(TargetFrameworkNetStandard);$(TargetFrameworkNetCore);$(TargetFrameworkUap);$(TargetFrameworkIos);$(TargetFrameworkAndroid);$(TargetFrameworkMac)
+ $(TargetFrameworkNetStandard);$(TargetFrameworkNetCore);$(TargetFrameworkIos);$(TargetFrameworkAndroid);$(TargetFrameworkMac)
+ $(TargetFrameworkNetStandard);$(TargetFrameworkNetCore);
\ No newline at end of file
diff --git a/src/Microsoft.Identity.Client.Ref/Microsoft.Identity.Client.Ref.csproj b/src/Microsoft.Identity.Client.Ref/Microsoft.Identity.Client.Ref.csproj
index e8e70b243e..bc622db644 100644
--- a/src/Microsoft.Identity.Client.Ref/Microsoft.Identity.Client.Ref.csproj
+++ b/src/Microsoft.Identity.Client.Ref/Microsoft.Identity.Client.Ref.csproj
@@ -31,8 +31,4 @@
$(DefineConstants);NETSTANDARD_BUILDTIME
-
-
-
-
diff --git a/src/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj b/src/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj
index 804755f119..276754ccb0 100644
--- a/src/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj
+++ b/src/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj
@@ -1,5 +1,6 @@
+
@@ -23,4 +24,7 @@
+
+
+
\ No newline at end of file
diff --git a/tests/CacheCompat/CommonCache.Test.AdalV3/CommonCache.Test.AdalV3.csproj b/tests/CacheCompat/CommonCache.Test.AdalV3/CommonCache.Test.AdalV3.csproj
index 2872a41bbd..7d6fd32ce6 100644
--- a/tests/CacheCompat/CommonCache.Test.AdalV3/CommonCache.Test.AdalV3.csproj
+++ b/tests/CacheCompat/CommonCache.Test.AdalV3/CommonCache.Test.AdalV3.csproj
@@ -38,18 +38,15 @@
7.1
-
- ..\..\..\packages\CommandLineParser.2.3.0\lib\net45\CommandLine.dll
-
-
- ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.19.8\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll
-
-
- ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.19.8\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll
-
-
- ..\..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll
-
+
+ 2.4.3
+
+
+ 3.19.8
+
+
+ 12.0.1
+
@@ -76,16 +73,5 @@
CommonCache.Test.Common
-
-
- 2.3.0
-
-
- 3.19.8
-
-
- 12.0.1
-
-
\ No newline at end of file
diff --git a/tests/CacheCompat/CommonCache.Test.AdalV4/CommonCache.Test.AdalV4.csproj b/tests/CacheCompat/CommonCache.Test.AdalV4/CommonCache.Test.AdalV4.csproj
index 95725723ae..3de4b3e938 100644
--- a/tests/CacheCompat/CommonCache.Test.AdalV4/CommonCache.Test.AdalV4.csproj
+++ b/tests/CacheCompat/CommonCache.Test.AdalV4/CommonCache.Test.AdalV4.csproj
@@ -38,15 +38,15 @@
7.1
-
- ..\..\..\packages\CommandLineParser.2.3.0\lib\net45\CommandLine.dll
-
-
- ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.4.4.2\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll
-
-
- ..\..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll
-
+
+ 2.4.3
+
+
+ 4.5.0
+
+
+ 12.0.1
+
@@ -76,16 +76,5 @@
CommonCache.Test.Common
-
-
- 2.3.0
-
-
- 4.4.2
-
-
- 12.0.1
-
-
\ No newline at end of file
diff --git a/tests/CacheCompat/CommonCache.Test.Common/CommonCache.Test.Common.csproj b/tests/CacheCompat/CommonCache.Test.Common/CommonCache.Test.Common.csproj
index 9ddcc504fb..82056ffef6 100644
--- a/tests/CacheCompat/CommonCache.Test.Common/CommonCache.Test.Common.csproj
+++ b/tests/CacheCompat/CommonCache.Test.Common/CommonCache.Test.Common.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/tests/CacheCompat/CommonCache.Test.MsalV2/CommonCache.Test.MsalV2.csproj b/tests/CacheCompat/CommonCache.Test.MsalV2/CommonCache.Test.MsalV2.csproj
index ffb8761e1a..85969ee17e 100644
--- a/tests/CacheCompat/CommonCache.Test.MsalV2/CommonCache.Test.MsalV2.csproj
+++ b/tests/CacheCompat/CommonCache.Test.MsalV2/CommonCache.Test.MsalV2.csproj
@@ -38,12 +38,15 @@
7.1
-
- ..\..\..\packages\CommandLineParser.2.3.0\lib\net45\CommandLine.dll
-
-
- ..\..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll
-
+
+ 2.4.3
+
+
+ 4.5.0
+
+
+ 12.0.1
+
@@ -78,13 +81,5 @@
CommonCache.Test.Common
-
-
- 2.3.0
-
-
- 12.0.1
-
-
\ No newline at end of file
diff --git a/tests/CacheCompat/CommonCache.Test.Unit/CommonCache.Test.Unit.csproj b/tests/CacheCompat/CommonCache.Test.Unit/CommonCache.Test.Unit.csproj
index 0b82d811be..39fe030bb9 100644
--- a/tests/CacheCompat/CommonCache.Test.Unit/CommonCache.Test.Unit.csproj
+++ b/tests/CacheCompat/CommonCache.Test.Unit/CommonCache.Test.Unit.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/tests/Microsoft.Identity.Test.Android.UIAutomation/Microsoft.Identity.Test.Android.UIAutomation.csproj b/tests/Microsoft.Identity.Test.Android.UIAutomation/Microsoft.Identity.Test.Android.UIAutomation.csproj
index 1e0c4f2c6d..e33f6fc68d 100644
--- a/tests/Microsoft.Identity.Test.Android.UIAutomation/Microsoft.Identity.Test.Android.UIAutomation.csproj
+++ b/tests/Microsoft.Identity.Test.Android.UIAutomation/Microsoft.Identity.Test.Android.UIAutomation.csproj
@@ -32,8 +32,8 @@
12.0.1
-
-
+
+
@@ -46,7 +46,7 @@
-
+
diff --git a/tests/Microsoft.Identity.Test.Common/Microsoft.Identity.Test.Common.csproj b/tests/Microsoft.Identity.Test.Common/Microsoft.Identity.Test.Common.csproj
index 0a81f3383d..d05ad92e1b 100644
--- a/tests/Microsoft.Identity.Test.Common/Microsoft.Identity.Test.Common.csproj
+++ b/tests/Microsoft.Identity.Test.Common/Microsoft.Identity.Test.Common.csproj
@@ -7,7 +7,7 @@
-
+
@@ -16,4 +16,7 @@
+
+
+
\ No newline at end of file
diff --git a/tests/Microsoft.Identity.Test.Core.UIAutomation/Microsoft.Identity.Test.UIAutomation.Infrastructure.csproj b/tests/Microsoft.Identity.Test.Core.UIAutomation/Microsoft.Identity.Test.UIAutomation.Infrastructure.csproj
index a7ad5938e2..5103994837 100644
--- a/tests/Microsoft.Identity.Test.Core.UIAutomation/Microsoft.Identity.Test.UIAutomation.Infrastructure.csproj
+++ b/tests/Microsoft.Identity.Test.Core.UIAutomation/Microsoft.Identity.Test.UIAutomation.Infrastructure.csproj
@@ -30,8 +30,8 @@
-
-
+
+
@@ -53,7 +53,7 @@
-
+
diff --git a/tests/Microsoft.Identity.Test.Core.UIAutomation/MobileTestHelper.cs b/tests/Microsoft.Identity.Test.Core.UIAutomation/MobileTestHelper.cs
index c5a95edfbb..c6b3d0eb3c 100644
--- a/tests/Microsoft.Identity.Test.Core.UIAutomation/MobileTestHelper.cs
+++ b/tests/Microsoft.Identity.Test.Core.UIAutomation/MobileTestHelper.cs
@@ -42,7 +42,6 @@ public class MobileTestHelper
private string _acquirePageId;
private string _cachePageId;
private string _settingsPageId;
- private string _logPageId;
public MobileTestHelper(Xamarin.UITest.Platform platform)
{
@@ -525,13 +524,11 @@ private void SetPageNavigationIds(Xamarin.UITest.Platform platform)
_cachePageId = CoreUiTestConstants.CachePageAndroidID;
_acquirePageId = CoreUiTestConstants.AcquirePageAndroidId;
_settingsPageId = CoreUiTestConstants.SettingsPageAndroidId;
- _logPageId = CoreUiTestConstants.LogPageAndroidId;
break;
case Xamarin.UITest.Platform.iOS:
_cachePageId = CoreUiTestConstants.CachePageID;
_acquirePageId = CoreUiTestConstants.AcquirePageId;
_settingsPageId = CoreUiTestConstants.SettingsPageId;
- _logPageId = CoreUiTestConstants.LogPageId;
break;
}
}
diff --git a/tests/Microsoft.Identity.Test.LabInfrastructure/Microsoft.Identity.Test.LabInfrastructure.csproj b/tests/Microsoft.Identity.Test.LabInfrastructure/Microsoft.Identity.Test.LabInfrastructure.csproj
index d5503738b8..8c2a79498b 100644
--- a/tests/Microsoft.Identity.Test.LabInfrastructure/Microsoft.Identity.Test.LabInfrastructure.csproj
+++ b/tests/Microsoft.Identity.Test.LabInfrastructure/Microsoft.Identity.Test.LabInfrastructure.csproj
@@ -5,7 +5,7 @@
-
+
@@ -20,4 +20,8 @@
Always
+
+
+
+
diff --git a/tests/Microsoft.Identity.Test.SideBySide/Microsoft.Identity.Test.SideBySide.csproj b/tests/Microsoft.Identity.Test.SideBySide/Microsoft.Identity.Test.SideBySide.csproj
index 155b8607f2..e3da27354d 100644
--- a/tests/Microsoft.Identity.Test.SideBySide/Microsoft.Identity.Test.SideBySide.csproj
+++ b/tests/Microsoft.Identity.Test.SideBySide/Microsoft.Identity.Test.SideBySide.csproj
@@ -6,7 +6,7 @@
-
+
@@ -21,4 +21,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/tests/Microsoft.Identity.Test.Unit.net45/Microsoft.Identity.Test.Unit.net45.csproj b/tests/Microsoft.Identity.Test.Unit.net45/Microsoft.Identity.Test.Unit.net45.csproj
index 18673b7049..0c03f4f9df 100644
--- a/tests/Microsoft.Identity.Test.Unit.net45/Microsoft.Identity.Test.Unit.net45.csproj
+++ b/tests/Microsoft.Identity.Test.Unit.net45/Microsoft.Identity.Test.Unit.net45.csproj
@@ -16,12 +16,12 @@
-
+
-
+
@@ -35,4 +35,8 @@
Always
+
+
+
+
diff --git a/tests/Microsoft.Identity.Test.Unit.netcore/Microsoft.Identity.Test.Unit.netcore.csproj b/tests/Microsoft.Identity.Test.Unit.netcore/Microsoft.Identity.Test.Unit.netcore.csproj
index 1a9e883c37..cd5dee89f4 100644
--- a/tests/Microsoft.Identity.Test.Unit.netcore/Microsoft.Identity.Test.Unit.netcore.csproj
+++ b/tests/Microsoft.Identity.Test.Unit.netcore/Microsoft.Identity.Test.Unit.netcore.csproj
@@ -18,7 +18,7 @@
-
+
@@ -27,4 +27,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/tests/Microsoft.Identity.Test.iOS.UIAutomation/Microsoft.Identity.Test.iOS.UIAutomation.csproj b/tests/Microsoft.Identity.Test.iOS.UIAutomation/Microsoft.Identity.Test.iOS.UIAutomation.csproj
index 3218471b11..499426387c 100644
--- a/tests/Microsoft.Identity.Test.iOS.UIAutomation/Microsoft.Identity.Test.iOS.UIAutomation.csproj
+++ b/tests/Microsoft.Identity.Test.iOS.UIAutomation/Microsoft.Identity.Test.iOS.UIAutomation.csproj
@@ -34,7 +34,7 @@
all
- 2.6.2
+ 2.6.3
runtime; build; native; contentfiles; analyzers
all
@@ -42,11 +42,11 @@
12.0.1
-
-
-
-
-
+
+
+
+
+
@@ -54,7 +54,7 @@
-
+
diff --git a/tests/devapps/UWP/UWP.csproj b/tests/devapps/UWP/UWP.csproj
index a15d35666c..007930f6ed 100644
--- a/tests/devapps/UWP/UWP.csproj
+++ b/tests/devapps/UWP/UWP.csproj
@@ -12,7 +12,7 @@
en-US
UAP
10.0.17134.0
- 10.0.15063.0
+ 10.0.16299.0
14
512
{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
@@ -157,15 +157,11 @@
-
- {60117A9B-4BB8-472E-BFFF-52CBF67CA95A}
- Microsoft.Identity.Client
-
4.5.0
- 6.1.9
+ 6.1.7
{2ae44538-8e72-4d43-9cd1-b26c3a657814}
diff --git a/tests/devapps/XForms/PATCH.Xamarin.Common.targets b/tests/devapps/XForms/PATCH.Xamarin.Common.targets
deleted file mode 100644
index f4c7aebb3b..0000000000
--- a/tests/devapps/XForms/PATCH.Xamarin.Common.targets
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/devapps/XForms/XForms.Android/Properties/AndroidManifest.xml b/tests/devapps/XForms/XForms.Android/Properties/AndroidManifest.xml
index 38a48baaed..8fa2c24ca0 100644
--- a/tests/devapps/XForms/XForms.Android/Properties/AndroidManifest.xml
+++ b/tests/devapps/XForms/XForms.Android/Properties/AndroidManifest.xml
@@ -1,18 +1,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tests/devapps/XForms/XForms.Android/XForms.Android.csproj b/tests/devapps/XForms/XForms.Android/XForms.Android.csproj
index 250dad08f6..29fac08db7 100644
--- a/tests/devapps/XForms/XForms.Android/XForms.Android.csproj
+++ b/tests/devapps/XForms/XForms.Android/XForms.Android.csproj
@@ -17,7 +17,7 @@
Off
Properties\AndroidManifest.xml
false
- v8.1
+ v9.0
@@ -31,9 +31,9 @@
TRACE;DEBUG
prompt
4
- True
+ False
None
- armeabi;armeabi-v7a;x86
+ armeabi-v7a;x86
False
False
False
@@ -42,6 +42,7 @@
False
False
False
+
pdbonly
@@ -53,7 +54,7 @@
False
SdkOnly
-
+
$(DefineConstants);ARIA_TELEMETRY_ENABLED
@@ -84,9 +85,6 @@
-
-
-
@@ -98,26 +96,25 @@
runtime; build; native; contentfiles; analyzers
all
-
- 2.6.2
+
runtime; build; native; contentfiles; analyzers
all
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
- 0.0.6
+ 0.0.8
{3433eb33-114a-4db7-bc57-14f17f55da3c}
@@ -133,8 +130,6 @@
-
-
../../../../build/SolutionWideAnalyzerConfig.ruleset
diff --git a/tests/devapps/XForms/XForms.UWP/XForms.UWP.csproj b/tests/devapps/XForms/XForms.UWP/XForms.UWP.csproj
index 07db66337c..3b448ea520 100644
--- a/tests/devapps/XForms/XForms.UWP/XForms.UWP.csproj
+++ b/tests/devapps/XForms/XForms.UWP/XForms.UWP.csproj
@@ -163,8 +163,8 @@
0.0.8
-
-
+
+
diff --git a/tests/devapps/XForms/XForms.iOS/XForms.iOS.csproj b/tests/devapps/XForms/XForms.iOS/XForms.iOS.csproj
index 0594d7b637..06af7e52e4 100644
--- a/tests/devapps/XForms/XForms.iOS/XForms.iOS.csproj
+++ b/tests/devapps/XForms/XForms.iOS/XForms.iOS.csproj
@@ -116,9 +116,9 @@
4.3.0
all
-
+
- 2.5.0.122203
+ 3.5.0.129452
0.21.7
@@ -137,6 +137,4 @@
-
-
\ No newline at end of file
diff --git a/tests/devapps/XForms/XForms/AcquirePage.xaml b/tests/devapps/XForms/XForms/AcquirePage.xaml
index 7b4b10503a..fcc2c2eb3c 100644
--- a/tests/devapps/XForms/XForms/AcquirePage.xaml
+++ b/tests/devapps/XForms/XForms/AcquirePage.xaml
@@ -42,8 +42,8 @@
-
-
+
+
diff --git a/tests/devapps/XForms/XForms/AcquirePage.xaml.cs b/tests/devapps/XForms/XForms/AcquirePage.xaml.cs
index b17ea9ef2c..c1e676b250 100644
--- a/tests/devapps/XForms/XForms/AcquirePage.xaml.cs
+++ b/tests/devapps/XForms/XForms/AcquirePage.xaml.cs
@@ -157,7 +157,7 @@ private string GetSelectedUserId()
return UserNotSelected.Equals(selectedUserId, StringComparison.OrdinalIgnoreCase) ? null : selectedUserId;
}
- private async Task OnAcquireSilentlyClickedAsync(object sender, EventArgs e)
+ private async void OnAcquireSilentlyClickedAsync(object sender, EventArgs e)
{
acquireResponseLabel.Text = "Starting silent token acquisition";
await Task.Delay(700).ConfigureAwait(true);
@@ -191,7 +191,7 @@ private async Task OnAcquireSilentlyClickedAsync(object sender, EventArgs e)
}
}
- private async Task OnAcquireClickedAsync(object sender, EventArgs e)
+ private async void OnAcquireClickedAsync(object sender, EventArgs e)
{
try
{
@@ -235,7 +235,7 @@ private async Task OnAcquireClickedAsync(object sender, EventArgs e)
}
}
- private async Task OnAcquireByDeviceCodeClickedAsync(object sender, EventArgs e)
+ private async void OnAcquireByDeviceCodeClickedAsync(object sender, EventArgs e)
{
try
{
diff --git a/tests/devapps/XForms/XForms/CachePage.xaml.cs b/tests/devapps/XForms/XForms/CachePage.xaml.cs
index 0b1ee51c73..58f2f7b68b 100644
--- a/tests/devapps/XForms/XForms/CachePage.xaml.cs
+++ b/tests/devapps/XForms/XForms/CachePage.xaml.cs
@@ -86,7 +86,7 @@ protected override void OnAppearing()
RefreshCacheView();
}
- private async Task OnClearClickedAsync(object sender, EventArgs e)
+ private async void OnClearClickedAsync(object sender, EventArgs e)
{
foreach (var user in await App.MsalPublicClient.GetAccountsAsync().ConfigureAwait(false))
{
@@ -146,7 +146,7 @@ public void OnInvalidate(object sender, EventArgs e)
RefreshCacheView();
}
- public async Task ShowAccessTokenDetailsAsync(object sender, EventArgs e)
+ public async void ShowAccessTokenDetailsAsync(object sender, EventArgs e)
{
var mi = (MenuItem)sender;
var accessTokenCacheItem = (MsalAccessTokenCacheItem)mi.CommandParameter;
@@ -155,7 +155,7 @@ public async Task ShowAccessTokenDetailsAsync(object sender, EventArgs e)
await Navigation.PushAsync(new AccessTokenCacheItemDetails(accessTokenCacheItem, null)).ConfigureAwait(false);
}
- public async Task ShowRefreshTokenDetailsAsync(object sender, EventArgs e)
+ public async void ShowRefreshTokenDetailsAsync(object sender, EventArgs e)
{
var mi = (MenuItem)sender;
var refreshTokenCacheItem = (MsalRefreshTokenCacheItem)mi.CommandParameter;
@@ -163,7 +163,7 @@ public async Task ShowRefreshTokenDetailsAsync(object sender, EventArgs e)
await Navigation.PushAsync(new RefreshTokenCacheItemDetails(refreshTokenCacheItem)).ConfigureAwait(false);
}
- public async Task ShowIdTokenDetailsAsync(object sender, EventArgs e)
+ public async void ShowIdTokenDetailsAsync(object sender, EventArgs e)
{
var mi = (MenuItem)sender;
var idTokenCacheItem = (MsalIdTokenCacheItem)mi.CommandParameter;
@@ -172,7 +172,7 @@ public async Task ShowIdTokenDetailsAsync(object sender, EventArgs e)
await Navigation.PushAsync(new IdTokenCacheItemDetails(idTokenCacheItem)).ConfigureAwait(false);
}
- public async Task ShowAccountDetailsAsync(object sender, EventArgs e)
+ public async void ShowAccountDetailsAsync(object sender, EventArgs e)
{
var mi = (MenuItem)sender;
var accountCacheItem = (MsalAccountCacheItem)mi.CommandParameter;
diff --git a/tests/devapps/XForms/XForms/XForms.csproj b/tests/devapps/XForms/XForms/XForms.csproj
index 75f0ccbd1c..acb26e369f 100644
--- a/tests/devapps/XForms/XForms/XForms.csproj
+++ b/tests/devapps/XForms/XForms/XForms.csproj
@@ -14,7 +14,7 @@
0.0.8
-
+