From 5748d647d5d12cc96aefbad60d97e8dac5b6b333 Mon Sep 17 00:00:00 2001 From: Mark Zuber Date: Fri, 25 Jan 2019 15:06:06 -0800 Subject: [PATCH 1/8] update to android 9 compiles --- Directory.Build.props | 2 +- LibsAndSamples.sln | 5 ++- samples/desktop/SampleApp/App.config | 4 +- .../Properties/Resources.Designer.cs | 44 ++++++++----------- .../SampleApp/Properties/Settings.Designer.cs | 22 ++++------ samples/desktop/SampleApp/SampleApp.csproj | 3 +- src/MSAL.Common.props | 13 +++--- src/MSAL.Frameworks.props | 4 +- .../Microsoft.Identity.Client.Ref.csproj | 1 + .../Microsoft.Identity.Client.csproj | 7 +++ .../CommonCache.Test.AdalV3.csproj | 2 +- .../CommonCache.Test.AdalV4.csproj | 4 +- .../CommonCache.Test.Common.csproj | 2 +- .../CommonCache.Test.MsalV2.csproj | 6 +-- .../CommonCache.Test.Unit.csproj | 4 +- ....Identity.Test.Android.UIAutomation.csproj | 6 +-- .../Microsoft.Identity.Test.Common.csproj | 3 ++ ...ty.Test.UIAutomation.Infrastructure.csproj | 6 +-- ...oft.Identity.Test.LabInfrastructure.csproj | 8 +++- .../Microsoft.Identity.Test.SideBySide.csproj | 6 ++- .../Microsoft.Identity.Test.Unit.net45.csproj | 6 ++- ...icrosoft.Identity.Test.Unit.netcore.csproj | 6 ++- ...soft.Identity.Test.iOS.UIAutomation.csproj | 12 ++--- tests/devapps/UWP/UWP.csproj | 8 +--- .../XForms/PATCH.Xamarin.Common.targets | 21 ++++----- .../Properties/AndroidManifest.xml | 30 ++++++------- .../XForms.Android/XForms.Android.csproj | 36 +++++++-------- .../XForms/XForms.UWP/XForms.UWP.csproj | 4 +- .../XForms/XForms.iOS/XForms.iOS.csproj | 4 +- tests/devapps/XForms/XForms/AcquirePage.xaml | 6 +-- tests/devapps/XForms/XForms/CachePage.xaml | 10 ++--- tests/devapps/XForms/XForms/XForms.csproj | 2 +- 32 files changed, 157 insertions(+), 140 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 89fd408123..6365ba811c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -15,7 +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. --> - + diff --git a/LibsAndSamples.sln b/LibsAndSamples.sln index 4e4e8a661d..ce2684257d 100644 --- a/LibsAndSamples.sln +++ b/LibsAndSamples.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2020 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28516.95 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9B0B5396-4D95-4C15-82ED-DC22B5A3123F}" EndProject @@ -39,6 +39,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/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..0b6fdd312d 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 @@ -151,7 +154,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..113152a51e 100644 --- a/src/MSAL.Frameworks.props +++ b/src/MSAL.Frameworks.props @@ -1,12 +1,12 @@ - net45 + net461 netstandard1.3 netcoreapp1.0 uap10.0 Xamarin.iOS10 xamarinmac20 - MonoAndroid8.1 + MonoAndroid9.0 $(TargetFrameworkNetDesktop);$(TargetFrameworkNetStandard);$(TargetFrameworkNetCore);$(TargetFrameworkUap);$(TargetFrameworkIos);$(TargetFrameworkAndroid);$(TargetFrameworkMac) $(TargetFrameworkNetStandard);$(TargetFrameworkNetCore);$(TargetFrameworkIos);$(TargetFrameworkAndroid);$(TargetFrameworkMac) 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..daa6d57b43 100644 --- a/src/Microsoft.Identity.Client.Ref/Microsoft.Identity.Client.Ref.csproj +++ b/src/Microsoft.Identity.Client.Ref/Microsoft.Identity.Client.Ref.csproj @@ -33,6 +33,7 @@ + diff --git a/src/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj b/src/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj index 804755f119..27bf4092e8 100644 --- a/src/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj +++ b/src/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj @@ -20,7 +20,14 @@ $(DefineConstants);NETSTANDARD_RUNTIME + + + + + + + \ 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..506b2d3f2a 100644 --- a/tests/CacheCompat/CommonCache.Test.AdalV3/CommonCache.Test.AdalV3.csproj +++ b/tests/CacheCompat/CommonCache.Test.AdalV3/CommonCache.Test.AdalV3.csproj @@ -78,7 +78,7 @@ - 2.3.0 + 2.4.3 3.19.8 diff --git a/tests/CacheCompat/CommonCache.Test.AdalV4/CommonCache.Test.AdalV4.csproj b/tests/CacheCompat/CommonCache.Test.AdalV4/CommonCache.Test.AdalV4.csproj index 95725723ae..df05d69457 100644 --- a/tests/CacheCompat/CommonCache.Test.AdalV4/CommonCache.Test.AdalV4.csproj +++ b/tests/CacheCompat/CommonCache.Test.AdalV4/CommonCache.Test.AdalV4.csproj @@ -78,10 +78,10 @@ - 2.3.0 + 2.4.3 - 4.4.2 + 4.5.0 12.0.1 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..3cedeb4181 100644 --- a/tests/CacheCompat/CommonCache.Test.MsalV2/CommonCache.Test.MsalV2.csproj +++ b/tests/CacheCompat/CommonCache.Test.MsalV2/CommonCache.Test.MsalV2.csproj @@ -38,8 +38,8 @@ 7.1 - - ..\..\..\packages\CommandLineParser.2.3.0\lib\net45\CommandLine.dll + + ..\..\..\packages\CommandLineParser.2.4.3\lib\net45\CommandLine.dll ..\..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll @@ -80,7 +80,7 @@ - 2.3.0 + 2.4.3 12.0.1 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..a2dd6301df 100644 --- a/tests/Microsoft.Identity.Test.Common/Microsoft.Identity.Test.Common.csproj +++ b/tests/Microsoft.Identity.Test.Common/Microsoft.Identity.Test.Common.csproj @@ -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.LabInfrastructure/Microsoft.Identity.Test.LabInfrastructure.csproj b/tests/Microsoft.Identity.Test.LabInfrastructure/Microsoft.Identity.Test.LabInfrastructure.csproj index b9e310e6b7..e9b87181e5 100644 --- a/tests/Microsoft.Identity.Test.LabInfrastructure/Microsoft.Identity.Test.LabInfrastructure.csproj +++ b/tests/Microsoft.Identity.Test.LabInfrastructure/Microsoft.Identity.Test.LabInfrastructure.csproj @@ -5,8 +5,8 @@ - - + + @@ -14,4 +14,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..2cc54d1b93 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 @@ -21,7 +21,7 @@ - + @@ -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..3a882fc6e2 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 @@ -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 f77bfb5ec0..928dd32c12 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} @@ -156,15 +156,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 index f4c7aebb3b..ec21562ed3 100644 --- a/tests/devapps/XForms/PATCH.Xamarin.Common.targets +++ b/tests/devapps/XForms/PATCH.Xamarin.Common.targets @@ -1,14 +1,14 @@ - + - + - + - + - + --> + 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..a951c9ffe4 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 @@ -33,7 +33,7 @@ 4 True 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 @@ -98,26 +99,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} @@ -134,7 +134,7 @@ - + ../../../../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..31797d9a41 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 583c80e434..156d15ccdd 100644 --- a/tests/devapps/XForms/XForms.iOS/XForms.iOS.csproj +++ b/tests/devapps/XForms/XForms.iOS/XForms.iOS.csproj @@ -114,7 +114,7 @@ 0.0.8 - 2.5.0.122203 + 3.4.0.1029999 0.21.7 @@ -134,5 +134,5 @@ - + \ No newline at end of file diff --git a/tests/devapps/XForms/XForms/AcquirePage.xaml b/tests/devapps/XForms/XForms/AcquirePage.xaml index 7b4b10503a..562af236a2 100644 --- a/tests/devapps/XForms/XForms/AcquirePage.xaml +++ b/tests/devapps/XForms/XForms/AcquirePage.xaml @@ -42,8 +42,8 @@ -