diff --git a/LibsAndSamples.sln b/LibsAndSamples.sln index b1cad98864..c749d61117 100644 --- a/LibsAndSamples.sln +++ b/LibsAndSamples.sln @@ -30,26 +30,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CacheCompat", "CacheCompat" tests\CacheCompat\Directory.Packages.props = tests\CacheCompat\Directory.Packages.props EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonCache.Test.AdalV3", "tests\CacheCompat\CommonCache.Test.AdalV3\CommonCache.Test.AdalV3.csproj", "{A8C2D397-BA21-4BD2-93AA-801B0E0804BC}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonCache.Test.Common", "tests\CacheCompat\CommonCache.Test.Common\CommonCache.Test.Common.csproj", "{408DCC1C-E810-4F9F-94EE-8421715A3661}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonCache.Test.AdalV4", "tests\CacheCompat\CommonCache.Test.AdalV4\CommonCache.Test.AdalV4.csproj", "{70DFE67C-D2D1-4BE4-B785-F4445C6F652D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonCache.Test.MsalV2", "tests\CacheCompat\CommonCache.Test.MsalV2\CommonCache.Test.MsalV2.csproj", "{8672FC71-00DE-491D-BCEB-101A2A7887E6}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonCache.Test.Unit", "tests\CacheCompat\CommonCache.Test.Unit\CommonCache.Test.Unit.csproj", "{3C21354D-601A-4902-A728-419C70891338}" ProjectSection(ProjectDependencies) = postProject - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11} = {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11} {8672FC71-00DE-491D-BCEB-101A2A7887E6} = {8672FC71-00DE-491D-BCEB-101A2A7887E6} {2EAA7878-3E2A-4355-9841-430BF45EA8BD} = {2EAA7878-3E2A-4355-9841-430BF45EA8BD} - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D} = {70DFE67C-D2D1-4BE4-B785-F4445C6F652D} - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC} = {A8C2D397-BA21-4BD2-93AA-801B0E0804BC} {B6BE589B-1DBB-4C36-803F-6D425723FA74} = {B6BE589B-1DBB-4C36-803F-6D425723FA74} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonCache.Test.AdalV5", "tests\CacheCompat\CommonCache.Test.AdalV5\CommonCache.Test.AdalV5.csproj", "{4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonCache.Test.MsalJava", "tests\CacheCompat\CommonCache.Test.MsalJava\CommonCache.Test.MsalJava.csproj", "{B6BE589B-1DBB-4C36-803F-6D425723FA74}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonCache.Test.MsalV3", "tests\CacheCompat\CommonCache.Test.MsalV3\CommonCache.Test.MsalV3.csproj", "{2EAA7878-3E2A-4355-9841-430BF45EA8BD}" @@ -401,48 +392,6 @@ Global {18559D36-C735-4933-AA86-398C8222D4F6}.Release|x64.Build.0 = Release|Any CPU {18559D36-C735-4933-AA86-398C8222D4F6}.Release|x86.ActiveCfg = Release|Any CPU {18559D36-C735-4933-AA86-398C8222D4F6}.Release|x86.Build.0 = Release|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug + MobileApps|Any CPU.ActiveCfg = Debug + MobileApps|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug + MobileApps|Any CPU.Build.0 = Debug + MobileApps|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug + MobileApps|ARM.ActiveCfg = Debug + MobileApps|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug + MobileApps|ARM.Build.0 = Debug + MobileApps|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug + MobileApps|ARM64.ActiveCfg = Debug + MobileApps|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug + MobileApps|ARM64.Build.0 = Debug + MobileApps|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug + MobileApps|iPhone.ActiveCfg = Debug + MobileApps|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug + MobileApps|iPhone.Build.0 = Debug + MobileApps|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug + MobileApps|iPhoneSimulator.ActiveCfg = Debug + MobileApps|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug + MobileApps|iPhoneSimulator.Build.0 = Debug + MobileApps|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug + MobileApps|x64.ActiveCfg = Debug + MobileApps|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug + MobileApps|x64.Build.0 = Debug + MobileApps|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug + MobileApps|x86.ActiveCfg = Debug + MobileApps|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug + MobileApps|x86.Build.0 = Debug + MobileApps|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug|ARM.ActiveCfg = Debug|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug|ARM.Build.0 = Debug|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug|ARM64.Build.0 = Debug|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug|iPhone.Build.0 = Debug|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug|x64.ActiveCfg = Debug|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug|x64.Build.0 = Debug|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug|x86.ActiveCfg = Debug|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Debug|x86.Build.0 = Debug|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Release|Any CPU.Build.0 = Release|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Release|ARM.ActiveCfg = Release|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Release|ARM.Build.0 = Release|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Release|ARM64.ActiveCfg = Release|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Release|ARM64.Build.0 = Release|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Release|iPhone.ActiveCfg = Release|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Release|iPhone.Build.0 = Release|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Release|x64.ActiveCfg = Release|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Release|x64.Build.0 = Release|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Release|x86.ActiveCfg = Release|Any CPU - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC}.Release|x86.Build.0 = Release|Any CPU {408DCC1C-E810-4F9F-94EE-8421715A3661}.Debug + MobileApps|Any CPU.ActiveCfg = Debug + MobileApps|Any CPU {408DCC1C-E810-4F9F-94EE-8421715A3661}.Debug + MobileApps|Any CPU.Build.0 = Debug + MobileApps|Any CPU {408DCC1C-E810-4F9F-94EE-8421715A3661}.Debug + MobileApps|ARM.ActiveCfg = Debug + MobileApps|Any CPU @@ -485,48 +434,6 @@ Global {408DCC1C-E810-4F9F-94EE-8421715A3661}.Release|x64.Build.0 = Release|Any CPU {408DCC1C-E810-4F9F-94EE-8421715A3661}.Release|x86.ActiveCfg = Release|Any CPU {408DCC1C-E810-4F9F-94EE-8421715A3661}.Release|x86.Build.0 = Release|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug + MobileApps|Any CPU.ActiveCfg = Debug + MobileApps|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug + MobileApps|Any CPU.Build.0 = Debug + MobileApps|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug + MobileApps|ARM.ActiveCfg = Debug + MobileApps|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug + MobileApps|ARM.Build.0 = Debug + MobileApps|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug + MobileApps|ARM64.ActiveCfg = Debug + MobileApps|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug + MobileApps|ARM64.Build.0 = Debug + MobileApps|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug + MobileApps|iPhone.ActiveCfg = Debug + MobileApps|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug + MobileApps|iPhone.Build.0 = Debug + MobileApps|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug + MobileApps|iPhoneSimulator.ActiveCfg = Debug + MobileApps|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug + MobileApps|iPhoneSimulator.Build.0 = Debug + MobileApps|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug + MobileApps|x64.ActiveCfg = Debug + MobileApps|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug + MobileApps|x64.Build.0 = Debug + MobileApps|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug + MobileApps|x86.ActiveCfg = Debug + MobileApps|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug + MobileApps|x86.Build.0 = Debug + MobileApps|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug|ARM.ActiveCfg = Debug|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug|ARM.Build.0 = Debug|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug|ARM64.Build.0 = Debug|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug|iPhone.Build.0 = Debug|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug|x64.ActiveCfg = Debug|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug|x64.Build.0 = Debug|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug|x86.ActiveCfg = Debug|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Debug|x86.Build.0 = Debug|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Release|Any CPU.Build.0 = Release|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Release|ARM.ActiveCfg = Release|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Release|ARM.Build.0 = Release|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Release|ARM64.ActiveCfg = Release|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Release|ARM64.Build.0 = Release|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Release|iPhone.ActiveCfg = Release|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Release|iPhone.Build.0 = Release|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Release|x64.ActiveCfg = Release|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Release|x64.Build.0 = Release|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Release|x86.ActiveCfg = Release|Any CPU - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D}.Release|x86.Build.0 = Release|Any CPU {8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug + MobileApps|Any CPU.ActiveCfg = Debug + MobileApps|Any CPU {8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug + MobileApps|Any CPU.Build.0 = Debug + MobileApps|Any CPU {8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug + MobileApps|ARM.ActiveCfg = Debug + MobileApps|Any CPU @@ -611,48 +518,6 @@ Global {3C21354D-601A-4902-A728-419C70891338}.Release|x64.Build.0 = Release|Any CPU {3C21354D-601A-4902-A728-419C70891338}.Release|x86.ActiveCfg = Release|Any CPU {3C21354D-601A-4902-A728-419C70891338}.Release|x86.Build.0 = Release|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug + MobileApps|Any CPU.ActiveCfg = Debug + MobileApps|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug + MobileApps|Any CPU.Build.0 = Debug + MobileApps|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug + MobileApps|ARM.ActiveCfg = Debug + MobileApps|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug + MobileApps|ARM.Build.0 = Debug + MobileApps|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug + MobileApps|ARM64.ActiveCfg = Debug + MobileApps|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug + MobileApps|ARM64.Build.0 = Debug + MobileApps|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug + MobileApps|iPhone.ActiveCfg = Debug + MobileApps|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug + MobileApps|iPhone.Build.0 = Debug + MobileApps|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug + MobileApps|iPhoneSimulator.ActiveCfg = Debug + MobileApps|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug + MobileApps|iPhoneSimulator.Build.0 = Debug + MobileApps|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug + MobileApps|x64.ActiveCfg = Debug + MobileApps|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug + MobileApps|x64.Build.0 = Debug + MobileApps|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug + MobileApps|x86.ActiveCfg = Debug + MobileApps|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug + MobileApps|x86.Build.0 = Debug + MobileApps|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug|ARM.ActiveCfg = Debug|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug|ARM.Build.0 = Debug|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug|ARM64.Build.0 = Debug|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug|iPhone.Build.0 = Debug|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug|x64.ActiveCfg = Debug|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug|x64.Build.0 = Debug|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug|x86.ActiveCfg = Debug|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Debug|x86.Build.0 = Debug|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Release|Any CPU.Build.0 = Release|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Release|ARM.ActiveCfg = Release|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Release|ARM.Build.0 = Release|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Release|ARM64.ActiveCfg = Release|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Release|ARM64.Build.0 = Release|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Release|iPhone.ActiveCfg = Release|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Release|iPhone.Build.0 = Release|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Release|x64.ActiveCfg = Release|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Release|x64.Build.0 = Release|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Release|x86.ActiveCfg = Release|Any CPU - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11}.Release|x86.Build.0 = Release|Any CPU {B6BE589B-1DBB-4C36-803F-6D425723FA74}.Debug + MobileApps|Any CPU.ActiveCfg = Debug + MobileApps|Any CPU {B6BE589B-1DBB-4C36-803F-6D425723FA74}.Debug + MobileApps|Any CPU.Build.0 = Debug + MobileApps|Any CPU {B6BE589B-1DBB-4C36-803F-6D425723FA74}.Debug + MobileApps|ARM.ActiveCfg = Debug + MobileApps|Any CPU @@ -2121,12 +1986,9 @@ Global {A181778D-5917-41CE-AA5F-7DAAA7B7F5BB} = {9B0B5396-4D95-4C15-82ED-DC22B5A3123F} {18559D36-C735-4933-AA86-398C8222D4F6} = {9B0B5396-4D95-4C15-82ED-DC22B5A3123F} {58B95AA7-BE17-40F2-9C9A-FA27C282A10A} = {9B0B5396-4D95-4C15-82ED-DC22B5A3123F} - {A8C2D397-BA21-4BD2-93AA-801B0E0804BC} = {58B95AA7-BE17-40F2-9C9A-FA27C282A10A} {408DCC1C-E810-4F9F-94EE-8421715A3661} = {58B95AA7-BE17-40F2-9C9A-FA27C282A10A} - {70DFE67C-D2D1-4BE4-B785-F4445C6F652D} = {58B95AA7-BE17-40F2-9C9A-FA27C282A10A} {8672FC71-00DE-491D-BCEB-101A2A7887E6} = {58B95AA7-BE17-40F2-9C9A-FA27C282A10A} {3C21354D-601A-4902-A728-419C70891338} = {58B95AA7-BE17-40F2-9C9A-FA27C282A10A} - {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11} = {58B95AA7-BE17-40F2-9C9A-FA27C282A10A} {B6BE589B-1DBB-4C36-803F-6D425723FA74} = {58B95AA7-BE17-40F2-9C9A-FA27C282A10A} {2EAA7878-3E2A-4355-9841-430BF45EA8BD} = {58B95AA7-BE17-40F2-9C9A-FA27C282A10A} {24D2AF71-A01E-4450-8C3F-B9923A81134B} = {34BE693E-3496-45A4-B1D2-D3A0E068EEDB} diff --git a/tests/CacheCompat/CommonCache.Test.AdalV3/CommonCache.Test.AdalV3.csproj b/tests/CacheCompat/CommonCache.Test.AdalV3/CommonCache.Test.AdalV3.csproj deleted file mode 100644 index f412be8837..0000000000 --- a/tests/CacheCompat/CommonCache.Test.AdalV3/CommonCache.Test.AdalV3.csproj +++ /dev/null @@ -1,27 +0,0 @@ - - - Exe - net48 - Debug;Release;Debug + MobileApps - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/CacheCompat/CommonCache.Test.AdalV3/FileBasedAdalV3TokenCache.cs b/tests/CacheCompat/CommonCache.Test.AdalV3/FileBasedAdalV3TokenCache.cs deleted file mode 100644 index b4b55f42b9..0000000000 --- a/tests/CacheCompat/CommonCache.Test.AdalV3/FileBasedAdalV3TokenCache.cs +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using System; -using System.IO; -using System.Security.Cryptography; -using CommonCache.Test.Common; -using Microsoft.IdentityModel.Clients.ActiveDirectory; - -namespace CommonCache.Test.AdalV3 -{ - // This is a simple persistent cache implementation for an ADAL V3 desktop application - public class FileBasedAdalV3TokenCache : TokenCache - { - private static readonly object s_fileLock = new object(); - - // Initializes the cache against a local file. - // If the file is already present, it loads its content in the ADAL cache - public FileBasedAdalV3TokenCache(string filePath) - { - CacheFilePath = filePath; - AfterAccess = AfterAccessNotification; - BeforeAccess = BeforeAccessNotification; - lock (s_fileLock) - { - Deserialize(CacheFileUtils.ReadFromFileIfExists(CacheFilePath)); - } - } - - public string CacheFilePath { get; } - - // Empties the persistent store. - public override void Clear() - { - base.Clear(); - File.Delete(CacheFilePath); - } - - // Triggered right before ADAL needs to access the cache. - // Reload the cache from the persistent store in case it changed since the last access. - private void BeforeAccessNotification(TokenCacheNotificationArgs args) - { - lock (s_fileLock) - { - Deserialize(CacheFileUtils.ReadFromFileIfExists(CacheFilePath)); - } - } - - // Triggered right after ADAL accessed the cache. - private void AfterAccessNotification(TokenCacheNotificationArgs args) - { - // if the access operation resulted in a cache update - if (HasStateChanged) - { - lock (s_fileLock) - { - // reflect changes in the persistent store - CacheFileUtils.WriteToFileIfNotNull(CacheFilePath, Serialize()); - // once the write operation took place, restore the HasStateChanged bit to false - HasStateChanged = false; - } - } - } - } -} diff --git a/tests/CacheCompat/CommonCache.Test.AdalV3/Program.cs b/tests/CacheCompat/CommonCache.Test.AdalV3/Program.cs deleted file mode 100644 index f8b6ea5acc..0000000000 --- a/tests/CacheCompat/CommonCache.Test.AdalV3/Program.cs +++ /dev/null @@ -1,75 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using CommonCache.Test.Common; -using Microsoft.IdentityModel.Clients.ActiveDirectory; - -namespace CommonCache.Test.AdalV3 -{ - public static class Program - { - public static void Main(string[] args) - { - new AdalV3CacheExecutor().Execute(args); - } - - private class AdalV3CacheExecutor : AbstractCacheExecutor - { - /// - protected override async Task> InternalExecuteAsync(TestInputData testInputData) - { - LoggerCallbackHandler.LogCallback = (LogLevel level, string message, bool containsPii) => - { - Console.WriteLine("{0}: {1}", level, message); - }; - - var results = new List(); - - foreach (var labUserData in testInputData.LabUserDatas) - { - var tokenCache = new FileBasedAdalV3TokenCache(CommonCacheTestUtils.AdalV3CacheFilePath); - var authenticationContext = new AuthenticationContext(labUserData.Authority, tokenCache); - - try - { - var result = await authenticationContext.AcquireTokenSilentAsync( - TestInputData.MsGraph, - labUserData.ClientId, - new UserIdentifier(labUserData.Upn, UserIdentifierType.RequiredDisplayableId)).ConfigureAwait(false); - - Console.WriteLine($"got token for '{result.UserInfo.DisplayableId}' from the cache"); - results.Add(new CacheExecutorAccountResult( - labUserData.Upn, - result.UserInfo.DisplayableId, - true)); - } - catch (AdalSilentTokenAcquisitionException) - { - var result = await authenticationContext.AcquireTokenAsync( - TestInputData.MsGraph, - labUserData.ClientId, - new UserPasswordCredential(labUserData.Upn, labUserData.Password)).ConfigureAwait(false); - - if (string.IsNullOrWhiteSpace(result.AccessToken)) - { - results.Add(new CacheExecutorAccountResult(labUserData.Upn, string.Empty, false)); - } - else - { - Console.WriteLine($"got token for '{result.UserInfo.DisplayableId}' without the cache"); - results.Add(new CacheExecutorAccountResult( - labUserData.Upn, - result.UserInfo.DisplayableId, - false)); - } - } - } - - return results; - } - } - } -} diff --git a/tests/CacheCompat/CommonCache.Test.AdalV4/CommonCache.Test.AdalV4.csproj b/tests/CacheCompat/CommonCache.Test.AdalV4/CommonCache.Test.AdalV4.csproj deleted file mode 100644 index 63bd016beb..0000000000 --- a/tests/CacheCompat/CommonCache.Test.AdalV4/CommonCache.Test.AdalV4.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - Exe - net48 - Debug;Release;Debug + MobileApps - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/CacheCompat/CommonCache.Test.AdalV4/FileBasedTokenCache.cs b/tests/CacheCompat/CommonCache.Test.AdalV4/FileBasedTokenCache.cs deleted file mode 100644 index a2e1f14f1e..0000000000 --- a/tests/CacheCompat/CommonCache.Test.AdalV4/FileBasedTokenCache.cs +++ /dev/null @@ -1,95 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using System.IO; -using System.Security.Cryptography; -using CommonCache.Test.Common; -using Microsoft.Identity.Core.Cache; -using Microsoft.IdentityModel.Clients.ActiveDirectory; - -namespace CommonCache.Test.AdalV4 -{ - /// - /// Simple file based persistent cache implementation for a desktop application (from ADAL 4.x) - /// - public class FileBasedTokenCache : TokenCache - { - private static readonly object s_fileLock = new object(); - private readonly CacheStorageType _cacheStorageType; - - // Initializes the cache against a local file. - // If the file is already present, it loads its content in the ADAL cache - public FileBasedTokenCache(CacheStorageType cacheStorageType, string adalV3FilePath, string unifiedCacheFilePath) - { - _cacheStorageType = cacheStorageType; - AdalV3CacheFilePath = adalV3FilePath; - UnifiedCacheFilePath = unifiedCacheFilePath; - - AfterAccess = AfterAccessNotification; - BeforeAccess = BeforeAccessNotification; - - lock (s_fileLock) - { - var cacheData = new CacheData - { - AdalV3State = CacheFileUtils.ReadFromFileIfExists(AdalV3CacheFilePath), - UnifiedState = CacheFileUtils.ReadFromFileIfExists(UnifiedCacheFilePath) - }; - DeserializeAdalAndUnifiedCache(cacheData); - } - } - - public string AdalV3CacheFilePath { get; } - public string UnifiedCacheFilePath { get; } - - // Empties the persistent store. - public override void Clear() - { - base.Clear(); - File.Delete(AdalV3CacheFilePath); - File.Delete(UnifiedCacheFilePath); - } - - // Triggered right before ADAL needs to access the cache. - // Reload the cache from the persistent store in case it changed since the last access. - private void BeforeAccessNotification(TokenCacheNotificationArgs args) - { - lock (s_fileLock) - { - var cacheData = new CacheData - { - AdalV3State = CacheFileUtils.ReadFromFileIfExists(AdalV3CacheFilePath), - UnifiedState = CacheFileUtils.ReadFromFileIfExists(UnifiedCacheFilePath) - }; - DeserializeAdalAndUnifiedCache(cacheData); - } - } - - // Triggered right after ADAL accessed the cache. - private void AfterAccessNotification(TokenCacheNotificationArgs args) - { - // if the access operation resulted in a cache update - if (HasStateChanged) - { - lock (s_fileLock) - { - // reflect changes in the persistent store - var cacheData = SerializeAdalAndUnifiedCache(); - - if ((_cacheStorageType & CacheStorageType.Adal) == CacheStorageType.Adal) - { - CacheFileUtils.WriteToFileIfNotNull(AdalV3CacheFilePath, cacheData.AdalV3State); - } - - if ((_cacheStorageType & CacheStorageType.MsalV2) == CacheStorageType.MsalV2) - { - CacheFileUtils.WriteToFileIfNotNull(UnifiedCacheFilePath, cacheData.UnifiedState); - } - - // once the write operation took place, restore the HasStateChanged bit to false - HasStateChanged = false; - } - } - } - } -} diff --git a/tests/CacheCompat/CommonCache.Test.AdalV4/Program.cs b/tests/CacheCompat/CommonCache.Test.AdalV4/Program.cs deleted file mode 100644 index bd5ed50cfe..0000000000 --- a/tests/CacheCompat/CommonCache.Test.AdalV4/Program.cs +++ /dev/null @@ -1,79 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using CommonCache.Test.Common; -using Microsoft.IdentityModel.Clients.ActiveDirectory; - -namespace CommonCache.Test.AdalV4 -{ - public static class Program - { - public static void Main(string[] args) - { - new AdalV4CacheExecutor().Execute(args); - } - - private class AdalV4CacheExecutor : AbstractCacheExecutor - { - /// - protected override async Task> InternalExecuteAsync(TestInputData testInputData) - { - LoggerCallbackHandler.LogCallback = (LogLevel level, string message, bool containsPii) => - { - Console.WriteLine("{0}: {1}", level, message); - }; - - var results = new List(); - - foreach (var labUserData in testInputData.LabUserDatas) - { - var tokenCache = new FileBasedTokenCache( - testInputData.StorageType, - CommonCacheTestUtils.AdalV3CacheFilePath, - CommonCacheTestUtils.MsalV2CacheFilePath); - - var authenticationContext = new AuthenticationContext(labUserData.Authority, tokenCache); - - try - { - var result = await authenticationContext.AcquireTokenSilentAsync( - TestInputData.MsGraph, - labUserData.ClientId, - new UserIdentifier(labUserData.Upn, UserIdentifierType.RequiredDisplayableId)).ConfigureAwait(false); - - Console.WriteLine($"got token for '{result.UserInfo.DisplayableId}' from the cache"); - results.Add(new CacheExecutorAccountResult( - labUserData.Upn, - result.UserInfo.DisplayableId, - true)); - } - catch (AdalSilentTokenAcquisitionException) - { - var result = await authenticationContext.AcquireTokenAsync( - TestInputData.MsGraph, - labUserData.ClientId, - new UserPasswordCredential(labUserData.Upn, labUserData.Password)).ConfigureAwait(false); - - if (string.IsNullOrWhiteSpace(result.AccessToken)) - { - results.Add(new CacheExecutorAccountResult(labUserData.Upn, string.Empty, false)); - } - else - { - Console.WriteLine($"got token for '{result.UserInfo.DisplayableId}' without the cache"); - results.Add(new CacheExecutorAccountResult( - labUserData.Upn, - result.UserInfo.DisplayableId, - false)); - } - } - } - - return results; - } - } - } -} diff --git a/tests/CacheCompat/CommonCache.Test.AdalV5/CommonCache.Test.AdalV5.csproj b/tests/CacheCompat/CommonCache.Test.AdalV5/CommonCache.Test.AdalV5.csproj deleted file mode 100644 index ea2056f6e4..0000000000 --- a/tests/CacheCompat/CommonCache.Test.AdalV5/CommonCache.Test.AdalV5.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - Exe - net48 - Debug;Release;Debug + MobileApps - - - - - - - - - diff --git a/tests/CacheCompat/CommonCache.Test.AdalV5/FileBasedTokenCache.cs b/tests/CacheCompat/CommonCache.Test.AdalV5/FileBasedTokenCache.cs deleted file mode 100644 index 2174cc4f55..0000000000 --- a/tests/CacheCompat/CommonCache.Test.AdalV5/FileBasedTokenCache.cs +++ /dev/null @@ -1,98 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using System; -using System.IO; -using System.Security.Cryptography; -using CommonCache.Test.Common; -using Microsoft.IdentityModel.Clients.ActiveDirectory; - -namespace CommonCache.Test.AdalV5 -{ - public class FileBasedTokenCache : TokenCache - { - private static readonly object s_fileLock = new object(); - private readonly CacheStorageType _cacheStorageType; - - // Initializes the cache against a local file. - // If the file is already present, it loads its content in the ADAL cache - public FileBasedTokenCache(CacheStorageType cacheStorageType, string adalV3FilePath, string msalV2FilePath, string msalV3FilePath) - { - _cacheStorageType = cacheStorageType; - AdalV3CacheFilePath = adalV3FilePath; - MsalV2CacheFilePath = msalV2FilePath; - MsalV3CacheFilePath = msalV3FilePath; - - AfterAccess = AfterAccessNotification; - BeforeAccess = BeforeAccessNotification; - - LoadCache(); - } - - private void LoadCache() - { - lock (s_fileLock) - { - var adalV3Bytes = CacheFileUtils.ReadFromFileIfExists(AdalV3CacheFilePath); - var msalV2Bytes = CacheFileUtils.ReadFromFileIfExists(MsalV2CacheFilePath); - var msalV3Bytes = CacheFileUtils.ReadFromFileIfExists(MsalV3CacheFilePath); - - DeserializeAdalV3(adalV3Bytes); - DeserializeMsalV2(msalV2Bytes); - DeserializeMsalV3(msalV3Bytes); - } - } - - public string AdalV3CacheFilePath { get; } - public string MsalV2CacheFilePath { get; } - public string MsalV3CacheFilePath { get; } - - // Empties the persistent store. - public override void Clear() - { - base.Clear(); - File.Delete(AdalV3CacheFilePath); - File.Delete(MsalV2CacheFilePath); - File.Delete(MsalV3CacheFilePath); - } - - // Triggered right before ADAL needs to access the cache. - // Reload the cache from the persistent store in case it changed since the last access. - private void BeforeAccessNotification(TokenCacheNotificationArgs args) - { - LoadCache(); - } - - // Triggered right after ADAL accessed the cache. - private void AfterAccessNotification(TokenCacheNotificationArgs args) - { - // if the access operation resulted in a cache update - if (HasStateChanged) - { - lock (s_fileLock) - { - var adalV3Bytes = SerializeAdalV3(); - var msalV2Bytes = SerializeMsalV2(); - var msalV3Bytes = SerializeMsalV3(); - - // reflect changes in the persistent store - if ((_cacheStorageType & CacheStorageType.Adal) == CacheStorageType.Adal) - { - CacheFileUtils.WriteToFileIfNotNull(AdalV3CacheFilePath, adalV3Bytes); - } - if ((_cacheStorageType & CacheStorageType.MsalV2) == CacheStorageType.MsalV2) - { - CacheFileUtils.WriteToFileIfNotNull(MsalV2CacheFilePath, msalV2Bytes); - } - if ((_cacheStorageType & CacheStorageType.MsalV3) == CacheStorageType.MsalV3) - { - CacheFileUtils.WriteToFileIfNotNull(MsalV3CacheFilePath, msalV3Bytes); - } - - // once the write operation took place, restore the HasStateChanged bit to false - HasStateChanged = false; - } - } - } - } -} diff --git a/tests/CacheCompat/CommonCache.Test.AdalV5/Program.cs b/tests/CacheCompat/CommonCache.Test.AdalV5/Program.cs deleted file mode 100644 index 2502d99f90..0000000000 --- a/tests/CacheCompat/CommonCache.Test.AdalV5/Program.cs +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using CommonCache.Test.Common; -using Microsoft.IdentityModel.Clients.ActiveDirectory; - -namespace CommonCache.Test.AdalV5 -{ - public static class Program - { - public static void Main(string[] args) - { - new AdalV5CacheExecutor().Execute(args); - } - - private class AdalV5CacheExecutor : AbstractCacheExecutor - { - /// - protected override async Task> InternalExecuteAsync(TestInputData testInputData) - { - LoggerCallbackHandler.LogCallback = (LogLevel level, string message, bool containsPii) => - { - Console.WriteLine("{0}: {1}", level, message); - }; - - var results = new List(); - - foreach (var labUserData in testInputData.LabUserDatas) - { - var tokenCache = new FileBasedTokenCache( - testInputData.StorageType, - CommonCacheTestUtils.AdalV3CacheFilePath, - CommonCacheTestUtils.MsalV2CacheFilePath, - CommonCacheTestUtils.MsalV3CacheFilePath); - - var authenticationContext = new AuthenticationContext(labUserData.Authority, tokenCache); - - try - { - Console.WriteLine("Calling ATS with username: {0}", labUserData.Upn); - var result = await authenticationContext.AcquireTokenSilentAsync( - TestInputData.MsGraph, - labUserData.ClientId, - new UserIdentifier(labUserData.Upn, UserIdentifierType.RequiredDisplayableId)).ConfigureAwait(false); - - Console.WriteLine($"got token for '{result.UserInfo.DisplayableId}' from the cache"); - - results.Add(new CacheExecutorAccountResult( - labUserData.Upn, - result.UserInfo.DisplayableId, - true)); - } - catch (AdalSilentTokenAcquisitionException) - { - var result = await authenticationContext.AcquireTokenAsync( - TestInputData.MsGraph, - labUserData.ClientId, - new UserPasswordCredential(labUserData.Upn, labUserData.Password)).ConfigureAwait(false); - - if (string.IsNullOrWhiteSpace(result.AccessToken)) - { - results.Add(new CacheExecutorAccountResult(labUserData.Upn, string.Empty, false)); - } - else - { - Console.WriteLine($"got token for '{result.UserInfo.DisplayableId}' without the cache"); - results.Add(new CacheExecutorAccountResult( - labUserData.Upn, - result.UserInfo.DisplayableId, - false)); - } - } - } - - return results; - } - } - } -} diff --git a/tests/CacheCompat/CommonCache.Test.Common/CommonCacheTestUtils.cs b/tests/CacheCompat/CommonCache.Test.Common/CommonCacheTestUtils.cs index aabd81a9fc..d72caebd9d 100644 --- a/tests/CacheCompat/CommonCache.Test.Common/CommonCacheTestUtils.cs +++ b/tests/CacheCompat/CommonCache.Test.Common/CommonCacheTestUtils.cs @@ -8,7 +8,6 @@ namespace CommonCache.Test.Common public static class CommonCacheTestUtils { public static string CacheFileDirectory => Path.Combine(Path.GetTempPath(), "adalcachecompattestdata"); - public static string AdalV3CacheFilePath => Path.Combine(CacheFileDirectory, "cacheAdalV3.bin"); public static string MsalV2CacheFilePath => Path.Combine(CacheFileDirectory, "msalCacheV2.bin"); public static string MsalV3CacheFilePath => Path.Combine(CacheFileDirectory, "msalCacheV3.bin"); @@ -19,10 +18,6 @@ public static void EnsureCacheFileDirectoryExists() public static void DeleteAllTestCaches() { - if (File.Exists(AdalV3CacheFilePath)) - { - File.Delete(AdalV3CacheFilePath); - } if (File.Exists(MsalV2CacheFilePath)) { diff --git a/tests/CacheCompat/CommonCache.Test.MsalV2/FileBasedTokenCacheHelper.cs b/tests/CacheCompat/CommonCache.Test.MsalV2/FileBasedTokenCacheHelper.cs index 93d591a95b..bd45e0ebee 100644 --- a/tests/CacheCompat/CommonCache.Test.MsalV2/FileBasedTokenCacheHelper.cs +++ b/tests/CacheCompat/CommonCache.Test.MsalV2/FileBasedTokenCacheHelper.cs @@ -17,13 +17,11 @@ public static class FileBasedTokenCacheHelper { private static readonly object s_fileLock = new object(); private static CacheStorageType s_cacheStorage = CacheStorageType.None; - public static string AdalV3CacheFileName { get; private set; } public static string UnifiedCacheFileName { get; private set; } - public static void ConfigureUserCache(CacheStorageType cacheStorageType, TokenCache tokenCache, string adalV3CacheFileName, string unifiedCacheFileName) + public static void ConfigureUserCache(CacheStorageType cacheStorageType, TokenCache tokenCache, string unifiedCacheFileName) { s_cacheStorage = cacheStorageType; - AdalV3CacheFileName = adalV3CacheFileName; UnifiedCacheFileName = unifiedCacheFileName; if (tokenCache != null) { @@ -36,10 +34,7 @@ public static void BeforeAccessNotification(TokenCacheNotificationArgs args) { lock (s_fileLock) { - var adalv3State = CacheFileUtils.ReadFromFileIfExists(AdalV3CacheFileName); var unifiedState = CacheFileUtils.ReadFromFileIfExists(UnifiedCacheFileName); - - args.TokenCache.DeserializeUnifiedAndAdalCache(new CacheData { AdalV3State = adalv3State, UnifiedState = unifiedState }); } } @@ -53,13 +48,6 @@ public static void AfterAccessNotification(TokenCacheNotificationArgs args) var cacheData = args.TokenCache.SerializeUnifiedAndAdalCache(); // reflect changes in the persistent store - if ((s_cacheStorage & CacheStorageType.Adal) == CacheStorageType.Adal) - { - if (!string.IsNullOrWhiteSpace(AdalV3CacheFileName)) - { - CacheFileUtils.WriteToFileIfNotNull(AdalV3CacheFileName, cacheData.AdalV3State); - } - } if ((s_cacheStorage & CacheStorageType.MsalV2) == CacheStorageType.MsalV2) { diff --git a/tests/CacheCompat/CommonCache.Test.MsalV2/Program.cs b/tests/CacheCompat/CommonCache.Test.MsalV2/Program.cs index e28f1578e0..b8bbf8ba83 100644 --- a/tests/CacheCompat/CommonCache.Test.MsalV2/Program.cs +++ b/tests/CacheCompat/CommonCache.Test.MsalV2/Program.cs @@ -37,7 +37,6 @@ protected override async Task> InternalE FileBasedTokenCacheHelper.ConfigureUserCache( testInputData.StorageType, tokenCache, - CommonCacheTestUtils.AdalV3CacheFilePath, CommonCacheTestUtils.MsalV2CacheFilePath); var results = new List(); diff --git a/tests/CacheCompat/CommonCache.Test.MsalV3/FileBasedTokenCacheHelper.cs b/tests/CacheCompat/CommonCache.Test.MsalV3/FileBasedTokenCacheHelper.cs index 3467e27cf5..ade529ab8f 100644 --- a/tests/CacheCompat/CommonCache.Test.MsalV3/FileBasedTokenCacheHelper.cs +++ b/tests/CacheCompat/CommonCache.Test.MsalV3/FileBasedTokenCacheHelper.cs @@ -20,19 +20,16 @@ public static class FileBasedTokenCacheHelper public static string MsalV2CacheFileName { get; private set; } public static string MsalV3CacheFileName { get; private set; } - public static string AdalV3CacheFileName { get; private set; } public static void ConfigureUserCache( CacheStorageType cacheStorageType, ITokenCache tokenCache, - string adalV3CacheFileName, string msalV2CacheFileName, string msalV3CacheFileName) { s_cacheStorageType = cacheStorageType; MsalV2CacheFileName = msalV2CacheFileName; MsalV3CacheFileName = msalV3CacheFileName; - AdalV3CacheFileName = adalV3CacheFileName; if (tokenCache != null) { @@ -45,14 +42,9 @@ public static void BeforeAccessNotification(TokenCacheNotificationArgs args) { lock (s_fileLock) { - var adalv3State = CacheFileUtils.ReadFromFileIfExists(AdalV3CacheFileName); var msalv2State = CacheFileUtils.ReadFromFileIfExists(MsalV2CacheFileName); var msalv3State = CacheFileUtils.ReadFromFileIfExists(MsalV3CacheFileName); - if (adalv3State != null) - { - args.TokenCache.DeserializeAdalV3(adalv3State); - } if (msalv2State != null) { #pragma warning disable CS0618 // Type or member is obsolete @@ -73,20 +65,12 @@ public static void AfterAccessNotification(TokenCacheNotificationArgs args) { lock (s_fileLock) { - var adalV3State = args.TokenCache.SerializeAdalV3(); #pragma warning disable CS0618 // Type or member is obsolete var msalV2State = args.TokenCache.SerializeMsalV2(); #pragma warning restore CS0618 // Type or member is obsolete var msalV3State = args.TokenCache.SerializeMsalV3(); // reflect changes in the persistent store - if ((s_cacheStorageType & CacheStorageType.Adal) == CacheStorageType.Adal) - { - if (!string.IsNullOrWhiteSpace(AdalV3CacheFileName)) - { - CacheFileUtils.WriteToFileIfNotNull(AdalV3CacheFileName, adalV3State); - } - } if ((s_cacheStorageType & CacheStorageType.MsalV2) == CacheStorageType.MsalV2) { diff --git a/tests/CacheCompat/CommonCache.Test.MsalV3/Program.cs b/tests/CacheCompat/CommonCache.Test.MsalV3/Program.cs index ef13fa569b..27d4a4c25f 100644 --- a/tests/CacheCompat/CommonCache.Test.MsalV3/Program.cs +++ b/tests/CacheCompat/CommonCache.Test.MsalV3/Program.cs @@ -46,7 +46,6 @@ protected override async Task> InternalE FileBasedTokenCacheHelper.ConfigureUserCache( testInputData.StorageType, app.UserTokenCache, - CommonCacheTestUtils.AdalV3CacheFilePath, CommonCacheTestUtils.MsalV2CacheFilePath, CommonCacheTestUtils.MsalV3CacheFilePath); diff --git a/tests/CacheCompat/CommonCache.Test.Unit/CacheExecutionTests.cs b/tests/CacheCompat/CommonCache.Test.Unit/CacheExecutionTests.cs index 8c355d9bc5..55c721556c 100644 --- a/tests/CacheCompat/CommonCache.Test.Unit/CacheExecutionTests.cs +++ b/tests/CacheCompat/CommonCache.Test.Unit/CacheExecutionTests.cs @@ -43,69 +43,6 @@ public static void AssemblyInit(TestContext testContext) } [DataTestMethod] - [DataRow(CacheProgramType.AdalV3, CacheProgramType.AdalV3, CacheStorageType.Adal, DisplayName = "AdalV3->AdalV3 adal v3 cache")] - [DataRow(CacheProgramType.AdalV3, CacheProgramType.AdalV4, CacheStorageType.Adal, DisplayName = "AdalV3->AdalV4 adal v3 cache")] - [DataRow(CacheProgramType.AdalV3, CacheProgramType.AdalV5, CacheStorageType.Adal, DisplayName = "AdalV3->AdalV5 adal v3 cache")] - [DataRow(CacheProgramType.AdalV3, CacheProgramType.MsalV2, CacheStorageType.Adal, DisplayName = "AdalV3->MsalV2 adal v3 cache")] - [DataRow(CacheProgramType.AdalV3, CacheProgramType.MsalV3, CacheStorageType.Adal, DisplayName = "AdalV3->MsalV3 adal v3 cache")] - public async Task TestAdalV3CacheCompatibilityAsync( - CacheProgramType interactiveType, - CacheProgramType silentType, - CacheStorageType cacheStorageType) - { - var executor = new CacheTestExecutor(s_labUsers, cacheStorageType); - await executor.ExecuteAsync(interactiveType, silentType, CancellationToken.None).ConfigureAwait(false); - } - - [DataTestMethod] - [DataRow(CacheProgramType.AdalV4, CacheProgramType.AdalV3, CacheStorageType.Adal, DisplayName = "AdalV4->AdalV3 adal v3 cache")] - [DataRow(CacheProgramType.AdalV4, CacheProgramType.AdalV4, CacheStorageType.Adal, DisplayName = "AdalV4->AdalV4 adal v3 cache")] - [DataRow(CacheProgramType.AdalV4, CacheProgramType.AdalV5, CacheStorageType.Adal, DisplayName = "AdalV4->AdalV5 adal v3 cache")] - [DataRow(CacheProgramType.AdalV4, CacheProgramType.AdalV4, CacheStorageType.MsalV2, DisplayName = "AdalV4->AdalV4 msal v2 cache")] - [DataRow(CacheProgramType.AdalV4, CacheProgramType.AdalV5, CacheStorageType.MsalV2, DisplayName = "AdalV4->AdalV5 msal v2 cache")] - [DataRow(CacheProgramType.AdalV4, CacheProgramType.MsalV2, CacheStorageType.Adal, DisplayName = "AdalV4->MsalV2 adal v3 cache")] - [DataRow(CacheProgramType.AdalV4, CacheProgramType.MsalV2, CacheStorageType.MsalV2, DisplayName = "AdalV4->MsalV2 msal v2 cache")] - [DataRow(CacheProgramType.AdalV4, CacheProgramType.MsalV3, CacheStorageType.Adal, DisplayName = "AdalV4->MsalV3 adal v3 cache")] - [DataRow(CacheProgramType.AdalV4, CacheProgramType.MsalV3, CacheStorageType.MsalV2, DisplayName = "AdalV4->MsalV3 msal v2 cache")] - public async Task TestAdalV4CacheCompatibilityAsync( - CacheProgramType interactiveType, - CacheProgramType silentType, - CacheStorageType cacheStorageType) - { - var executor = new CacheTestExecutor(s_labUsers, cacheStorageType); - await executor.ExecuteAsync(interactiveType, silentType, CancellationToken.None).ConfigureAwait(false); - } - - [DataTestMethod] - [DataRow(CacheProgramType.AdalV5, CacheProgramType.AdalV3, CacheStorageType.Adal, DisplayName = "AdalV5->AdalV3 adal v3 cache")] - [DataRow(CacheProgramType.AdalV5, CacheProgramType.AdalV4, CacheStorageType.Adal, DisplayName = "AdalV5->AdalV4 adal v3 cache")] - [DataRow(CacheProgramType.AdalV5, CacheProgramType.AdalV5, CacheStorageType.Adal, DisplayName = "AdalV5->AdalV5 adal v3 cache")] - [DataRow(CacheProgramType.AdalV5, CacheProgramType.AdalV4, CacheStorageType.MsalV2, DisplayName = "AdalV5->AdalV4 msal v2 cache")] - [DataRow(CacheProgramType.AdalV5, CacheProgramType.AdalV5, CacheStorageType.MsalV2, DisplayName = "AdalV5->AdalV5 msal v2 cache")] - [DataRow(CacheProgramType.AdalV5, CacheProgramType.AdalV5, CacheStorageType.MsalV3, DisplayName = "AdalV5->AdalV5 msal v3 cache")] - [DataRow(CacheProgramType.AdalV5, CacheProgramType.MsalV2, CacheStorageType.Adal, DisplayName = "AdalV5->MsalV2 adal v3 cache")] - [DataRow(CacheProgramType.AdalV5, CacheProgramType.MsalV2, CacheStorageType.MsalV2, DisplayName = "AdalV5->MsalV2 msal v2 cache")] - [DataRow(CacheProgramType.AdalV5, CacheProgramType.MsalV3, CacheStorageType.Adal, DisplayName = "AdalV5->MsalV3 adal v3 cache")] - [DataRow(CacheProgramType.AdalV5, CacheProgramType.MsalV3, CacheStorageType.MsalV2, DisplayName = "AdalV5->MsalV3 msal v2 cache")] - [DataRow(CacheProgramType.AdalV5, CacheProgramType.MsalV3, CacheStorageType.MsalV3, DisplayName = "AdalV5->MsalV3 msal v3 cache")] - public async Task TestAdalV5CacheCompatibilityAsync( - CacheProgramType interactiveType, - CacheProgramType silentType, - CacheStorageType cacheStorageType) - { - var executor = new CacheTestExecutor(s_labUsers, cacheStorageType); - await executor.ExecuteAsync(interactiveType, silentType, CancellationToken.None).ConfigureAwait(false); - } - - [DataTestMethod] - [DataRow(CacheProgramType.MsalV2, CacheProgramType.AdalV3, CacheStorageType.Adal, DisplayName = "MsalV2->AdalV3 adal v3 cache")] - [DataRow(CacheProgramType.MsalV2, CacheProgramType.AdalV4, CacheStorageType.Adal, DisplayName = "MsalV2->AdalV4 adal v3 cache")] - [DataRow(CacheProgramType.MsalV2, CacheProgramType.AdalV4, CacheStorageType.MsalV2, DisplayName = "MsalV2->AdalV4 msal v2 cache")] - [DataRow(CacheProgramType.MsalV2, CacheProgramType.AdalV5, CacheStorageType.Adal, DisplayName = "MsalV2->AdalV5 adal v3 cache")] - [DataRow(CacheProgramType.MsalV2, CacheProgramType.AdalV5, CacheStorageType.MsalV2, DisplayName = "MsalV2->AdalV5 msal v2 cache")] - [DataRow(CacheProgramType.MsalV2, CacheProgramType.MsalV2, CacheStorageType.Adal, DisplayName = "MsalV2->MsalV2 adal v3 cache")] - [DataRow(CacheProgramType.MsalV2, CacheProgramType.MsalV2, CacheStorageType.MsalV2, DisplayName = "MsalV2->MsalV2 msal v2 cache")] - [DataRow(CacheProgramType.MsalV2, CacheProgramType.MsalV3, CacheStorageType.Adal, DisplayName = "MsalV2->MsalV3 adal v3 cache")] [DataRow(CacheProgramType.MsalV2, CacheProgramType.MsalV3, CacheStorageType.MsalV2, DisplayName = "MsalV2->MsalV3 msal v2 cache")] public async Task TestMsalV2CacheCompatibilityAsync( CacheProgramType interactiveType, @@ -117,13 +54,6 @@ public async Task TestMsalV2CacheCompatibilityAsync( } [DataTestMethod] - [DataRow(CacheProgramType.MsalV3, CacheProgramType.AdalV3, CacheStorageType.Adal, DisplayName = "MsalV3->AdalV3 adal v3 cache")] - [DataRow(CacheProgramType.MsalV3, CacheProgramType.AdalV4, CacheStorageType.Adal, DisplayName = "MsalV3->AdalV4 adal v3 cache")] - [DataRow(CacheProgramType.MsalV3, CacheProgramType.AdalV4, CacheStorageType.MsalV2, DisplayName = "MsalV3->AdalV4 msal v2 cache")] - [DataRow(CacheProgramType.MsalV3, CacheProgramType.AdalV5, CacheStorageType.Adal, DisplayName = "MsalV3->AdalV5 adal v3 cache")] - [DataRow(CacheProgramType.MsalV3, CacheProgramType.AdalV5, CacheStorageType.MsalV2, DisplayName = "MsalV3->AdalV5 msal v2 cache")] - [DataRow(CacheProgramType.MsalV3, CacheProgramType.AdalV5, CacheStorageType.MsalV3, DisplayName = "MsalV3->AdalV5 msal v3 cache")] - [DataRow(CacheProgramType.MsalV3, CacheProgramType.MsalV3, CacheStorageType.Adal, DisplayName = "MsalV3->MsalV3 adal v3 cache")] [DataRow(CacheProgramType.MsalV3, CacheProgramType.MsalV3, CacheStorageType.MsalV2, DisplayName = "MsalV3->MsalV3 msal v2 cache")] [DataRow(CacheProgramType.MsalV3, CacheProgramType.MsalV3, CacheStorageType.MsalV3, DisplayName = "MsalV3->MsalV3 msal v3 cache")] public async Task TestMsalV3CacheCompatibilityAsync( @@ -138,8 +68,6 @@ public async Task TestMsalV3CacheCompatibilityAsync( [DataTestMethod] [DataRow(CacheProgramType.MsalV3, CacheProgramType.MsalJava, CacheStorageType.MsalV3, DisplayName = "MsalV3->MsalJava msal v3 cache")] [DataRow(CacheProgramType.MsalJava, CacheProgramType.MsalV3, CacheStorageType.MsalV3, DisplayName = "MsalJava->MsalV3 msal v3 cache")] - [DataRow(CacheProgramType.MsalJava, CacheProgramType.AdalV5, CacheStorageType.MsalV3, DisplayName = "MsalJava->AdalV5 msal v3 cache")] - [DataRow(CacheProgramType.AdalV5, CacheProgramType.MsalJava, CacheStorageType.MsalV3, DisplayName = "AdalV5->MsalJava msal v3 cache")] public async Task TestMsalJavaCacheCompatibilityAsync( CacheProgramType interactiveType, CacheProgramType silentType, diff --git a/tests/CacheCompat/CommonCache.Test.Unit/CommonCache.Test.Unit.csproj b/tests/CacheCompat/CommonCache.Test.Unit/CommonCache.Test.Unit.csproj index 28f587f174..5a22950dc0 100644 --- a/tests/CacheCompat/CommonCache.Test.Unit/CommonCache.Test.Unit.csproj +++ b/tests/CacheCompat/CommonCache.Test.Unit/CommonCache.Test.Unit.csproj @@ -23,15 +23,6 @@ - - false - - - false - - - false - false @@ -54,9 +45,6 @@ - - - diff --git a/tests/CacheCompat/CommonCache.Test.Unit/Utils/CacheProgramFactory.cs b/tests/CacheCompat/CommonCache.Test.Unit/Utils/CacheProgramFactory.cs index f8c93f0374..e492acc986 100644 --- a/tests/CacheCompat/CommonCache.Test.Unit/Utils/CacheProgramFactory.cs +++ b/tests/CacheCompat/CommonCache.Test.Unit/Utils/CacheProgramFactory.cs @@ -19,18 +19,6 @@ public static CacheProgram CreateCacheProgram(CacheProgramType cacheProgramType, switch (cacheProgramType) { - case CacheProgramType.AdalV3: - executablePath = Path.Combine(BaseExecutablePath, "AdalV3", "CommonCache.Test.AdalV3.exe"); - resultsFilePath = Path.Combine(CommonCacheTestUtils.CacheFileDirectory, "adalv3results.json"); - break; - case CacheProgramType.AdalV4: - executablePath = Path.Combine(BaseExecutablePath, "AdalV4", "CommonCache.Test.AdalV4.exe"); - resultsFilePath = Path.Combine(CommonCacheTestUtils.CacheFileDirectory, "adalv4results.json"); - break; - case CacheProgramType.AdalV5: - executablePath = Path.Combine(BaseExecutablePath, "AdalV5", "CommonCache.Test.AdalV5.exe"); - resultsFilePath = Path.Combine(CommonCacheTestUtils.CacheFileDirectory, "adalv5results.json"); - break; case CacheProgramType.MsalV2: executablePath = Path.Combine(BaseExecutablePath, "MsalV2", "CommonCache.Test.MsalV2.exe"); resultsFilePath = Path.Combine(CommonCacheTestUtils.CacheFileDirectory, "msalv2results.json"); diff --git a/tests/CacheCompat/CommonCache.Test.Unit/Utils/CacheTestExecutor.cs b/tests/CacheCompat/CommonCache.Test.Unit/Utils/CacheTestExecutor.cs index 98ffae934e..ee29d8c5e2 100644 --- a/tests/CacheCompat/CommonCache.Test.Unit/Utils/CacheTestExecutor.cs +++ b/tests/CacheCompat/CommonCache.Test.Unit/Utils/CacheTestExecutor.cs @@ -82,15 +82,6 @@ private async Task ExecuteCacheProgramAsync(CacheProgramType cacheProgramType, b private static void PrintCacheInfo() { - if (File.Exists(CommonCacheTestUtils.AdalV3CacheFilePath)) - { - Console.WriteLine($"Adal Cache Exists at: {CommonCacheTestUtils.AdalV3CacheFilePath}"); - Console.WriteLine("Adal Cache Size: " + Convert.ToInt32(new FileInfo(CommonCacheTestUtils.AdalV3CacheFilePath).Length)); - } - else - { - Console.WriteLine($"Adal Cache DOES NOT EXIST at: {CommonCacheTestUtils.AdalV3CacheFilePath}"); - } if (File.Exists(CommonCacheTestUtils.MsalV2CacheFilePath)) { diff --git a/tests/Microsoft.Identity.Test.Integration.netfx/HeadlessTests/GenericAuthorityTests.cs b/tests/Microsoft.Identity.Test.Integration.netfx/HeadlessTests/GenericAuthorityTests.cs index 044d436e61..f2c22569f2 100644 --- a/tests/Microsoft.Identity.Test.Integration.netfx/HeadlessTests/GenericAuthorityTests.cs +++ b/tests/Microsoft.Identity.Test.Integration.netfx/HeadlessTests/GenericAuthorityTests.cs @@ -63,6 +63,7 @@ public async Task BadSecret_Duende_Async() /// Based on the publicly available https://demo.duendesoftware.com/ [RunOn(TargetFrameworks.NetCore | TargetFrameworks.NetFx)] + [Ignore("Test is not running reliably")] public async Task ShouldSupportClientCredentialsPrivateKeyJwtWithDuendeDemoInstanceAsync() { var applicationConfiguration = new ApplicationConfiguration(MsalClientType.ConfidentialClient);