diff --git a/Directory.Packages.props b/Directory.Packages.props index 67ad066fd9..eacb3f5c4d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -16,7 +16,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -65,8 +65,8 @@ - - + + diff --git a/LibsAndSamples.sln b/LibsAndSamples.sln index c749d61117..df160731f7 100644 --- a/LibsAndSamples.sln +++ b/LibsAndSamples.sln @@ -136,8 +136,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Identity.Client.B EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Identity.Test.Integration.NetStandard", "tests\Microsoft.Identity.Test.Integration.netstandard\Microsoft.Identity.Test.Integration.NetStandard.csproj", "{69CE42A2-44DD-4740-856B-607C3BB5A92E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntuneMAMSampleiOS", "tests\devapps\Intune-xamarin-ios\IntuneMAMSampleiOS.csproj", "{034A5B86-A8AE-449D-B561-46F811329E6D}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{259B5734-1D43-43F7-8107-32F602A99019}" ProjectSection(SolutionItems) = preProject build\install-common.ps1 = build\install-common.ps1 @@ -1286,44 +1284,6 @@ Global {69CE42A2-44DD-4740-856B-607C3BB5A92E}.Release|x64.Build.0 = Release|Any CPU {69CE42A2-44DD-4740-856B-607C3BB5A92E}.Release|x86.ActiveCfg = Release|Any CPU {69CE42A2-44DD-4740-856B-607C3BB5A92E}.Release|x86.Build.0 = Release|Any CPU - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug + MobileApps|Any CPU.ActiveCfg = Debug + MobileApps|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug + MobileApps|Any CPU.Build.0 = Debug + MobileApps|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug + MobileApps|ARM.ActiveCfg = Debug + MobileApps|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug + MobileApps|ARM.Build.0 = Debug + MobileApps|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug + MobileApps|ARM64.ActiveCfg = Debug + MobileApps|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug + MobileApps|ARM64.Build.0 = Debug + MobileApps|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug + MobileApps|iPhone.ActiveCfg = Debug + MobileApps|iPhone - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug + MobileApps|iPhoneSimulator.ActiveCfg = Debug + MobileApps|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug + MobileApps|x64.ActiveCfg = Debug + MobileApps|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug + MobileApps|x64.Build.0 = Debug + MobileApps|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug + MobileApps|x86.ActiveCfg = Debug + MobileApps|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug + MobileApps|x86.Build.0 = Debug + MobileApps|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug|ARM.ActiveCfg = Debug|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug|ARM.Build.0 = Debug|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug|ARM64.ActiveCfg = Debug|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug|ARM64.Build.0 = Debug|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug|iPhone.ActiveCfg = Debug|iPhone - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug|iPhone.Build.0 = Debug|iPhone - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug|x64.Build.0 = Debug|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Debug|x86.Build.0 = Debug|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Release|ARM.ActiveCfg = Release|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Release|ARM.Build.0 = Release|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Release|ARM64.ActiveCfg = Release|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Release|ARM64.Build.0 = Release|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Release|iPhone.ActiveCfg = Release|iPhone - {034A5B86-A8AE-449D-B561-46F811329E6D}.Release|iPhone.Build.0 = Release|iPhone - {034A5B86-A8AE-449D-B561-46F811329E6D}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Release|x64.ActiveCfg = Release|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Release|x64.Build.0 = Release|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Release|x86.ActiveCfg = Release|iPhoneSimulator - {034A5B86-A8AE-449D-B561-46F811329E6D}.Release|x86.Build.0 = Release|iPhoneSimulator {3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug + MobileApps|Any CPU.ActiveCfg = Debug|Any CPU {3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug + MobileApps|Any CPU.Build.0 = Debug|Any CPU {3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}.Debug + MobileApps|ARM.ActiveCfg = Debug|Any CPU @@ -2012,7 +1972,6 @@ Global {DD23D8FF-86BA-4E9F-8AF1-0EBE0D86986A} = {CC07F293-91B9-45A3-AA3A-77885BBCB624} {6839F934-45F0-4026-8AF3-C3AEFB7D48A9} = {1A37FD75-94E9-4D6F-953A-0DABBD7B49E9} {69CE42A2-44DD-4740-856B-607C3BB5A92E} = {9B0B5396-4D95-4C15-82ED-DC22B5A3123F} - {034A5B86-A8AE-449D-B561-46F811329E6D} = {34BE693E-3496-45A4-B1D2-D3A0E068EEDB} {259B5734-1D43-43F7-8107-32F602A99019} = {EA983957-DC2F-4D9E-A2E3-79ADEB5CEB26} {3DC6EC76-D350-4D43-B206-A4CEC8AA36D4} = {9B0B5396-4D95-4C15-82ED-DC22B5A3123F} {BCAEE9AE-8D3E-4C77-A2E4-134E1552D5F8} = {34BE693E-3496-45A4-B1D2-D3A0E068EEDB} diff --git a/tests/CacheCompat/CommonCache.Test.Unit/CommonCache.Test.Unit.csproj b/tests/CacheCompat/CommonCache.Test.Unit/CommonCache.Test.Unit.csproj index 5a22950dc0..1b70dec7fe 100644 --- a/tests/CacheCompat/CommonCache.Test.Unit/CommonCache.Test.Unit.csproj +++ b/tests/CacheCompat/CommonCache.Test.Unit/CommonCache.Test.Unit.csproj @@ -9,7 +9,7 @@ - + diff --git a/tests/Microsoft.Identity.Test.Integration.netfx/Infrastructure/SeleniumExtensions.cs b/tests/Microsoft.Identity.Test.Integration.netfx/Infrastructure/SeleniumExtensions.cs index 726837d7f1..f518a42d88 100644 --- a/tests/Microsoft.Identity.Test.Integration.netfx/Infrastructure/SeleniumExtensions.cs +++ b/tests/Microsoft.Identity.Test.Integration.netfx/Infrastructure/SeleniumExtensions.cs @@ -70,7 +70,7 @@ public static void SaveScreenshot(this IWebDriver driver, TestContext testContex #endif Trace.WriteLine($"Saving picture to {failurePicturePath}"); - ss.SaveAsFile(failurePicturePath, ScreenshotImageFormat.Png); + ss.SaveAsFile(failurePicturePath); #if NETFRAMEWORK // Can't attach a file to the logs on netcore because mstest doesn't support it testContext.AddResultFile(failurePicturePath); diff --git a/tests/Microsoft.Identity.Test.Performance/Microsoft.Identity.Test.Performance.csproj b/tests/Microsoft.Identity.Test.Performance/Microsoft.Identity.Test.Performance.csproj index 43f9175788..77e2739b31 100644 --- a/tests/Microsoft.Identity.Test.Performance/Microsoft.Identity.Test.Performance.csproj +++ b/tests/Microsoft.Identity.Test.Performance/Microsoft.Identity.Test.Performance.csproj @@ -30,7 +30,7 @@ - +