Skip to content

Commit b54af18

Browse files
bgavrilMSbgavrilMS
authored
Bump dependencies and .net for test and remove msalv2 (#5020)
* Address non product warnings * Update * 3
1 parent 431b732 commit b54af18

File tree

26 files changed

+45
-291
lines changed

26 files changed

+45
-291
lines changed

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<DelaySign>false</DelaySign>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
11-
<!-- Projects must set these individually -->
11+
<!-- Projects must set this individually -->
1212
<IsPackable>false</IsPackable>
1313
</PropertyGroup>
1414

‎Directory.Packages.props

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</ItemGroup>
3434
<ItemGroup>
3535
<!-- Analyzers and dev packages -->
36-
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14" PrivateAssets="All" />
36+
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.19" PrivateAssets="All" />
3737
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" PrivateAssets="All" />
3838
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
3939
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" PrivateAssets="All" />
@@ -79,5 +79,8 @@
7979
<PackageVersion Include="System.Threading.Thread" Version="4.3.0" />
8080
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
8181
<PackageVersion Include="System.Windows.Forms" Version="4.0.0" />
82+
<PackageVersion Include="CommandLineParser" Version="2.8.0" />
83+
<PackageVersion Include="System.Formats.Asn1" Version="9.0.0"/>
84+
8285
</ItemGroup>
8386
</Project>

‎LibsAndSamples.sln

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,11 @@ EndProject
2323
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Identity.Test.Common", "tests\Microsoft.Identity.Test.Common\Microsoft.Identity.Test.Common.csproj", "{18559D36-C735-4933-AA86-398C8222D4F6}"
2424
EndProject
2525
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CacheCompat", "CacheCompat", "{58B95AA7-BE17-40F2-9C9A-FA27C282A10A}"
26-
ProjectSection(SolutionItems) = preProject
27-
tests\CacheCompat\Directory.Packages.props = tests\CacheCompat\Directory.Packages.props
28-
EndProjectSection
2926
EndProject
3027
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonCache.Test.Common", "tests\CacheCompat\CommonCache.Test.Common\CommonCache.Test.Common.csproj", "{408DCC1C-E810-4F9F-94EE-8421715A3661}"
3128
EndProject
32-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonCache.Test.MsalV2", "tests\CacheCompat\CommonCache.Test.MsalV2\CommonCache.Test.MsalV2.csproj", "{8672FC71-00DE-491D-BCEB-101A2A7887E6}"
33-
EndProject
3429
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonCache.Test.Unit", "tests\CacheCompat\CommonCache.Test.Unit\CommonCache.Test.Unit.csproj", "{3C21354D-601A-4902-A728-419C70891338}"
3530
ProjectSection(ProjectDependencies) = postProject
36-
{8672FC71-00DE-491D-BCEB-101A2A7887E6} = {8672FC71-00DE-491D-BCEB-101A2A7887E6}
3731
{2EAA7878-3E2A-4355-9841-430BF45EA8BD} = {2EAA7878-3E2A-4355-9841-430BF45EA8BD}
3832
{B6BE589B-1DBB-4C36-803F-6D425723FA74} = {B6BE589B-1DBB-4C36-803F-6D425723FA74}
3933
EndProjectSection
@@ -419,48 +413,6 @@ Global
419413
{408DCC1C-E810-4F9F-94EE-8421715A3661}.Release|x64.Build.0 = Release|Any CPU
420414
{408DCC1C-E810-4F9F-94EE-8421715A3661}.Release|x86.ActiveCfg = Release|Any CPU
421415
{408DCC1C-E810-4F9F-94EE-8421715A3661}.Release|x86.Build.0 = Release|Any CPU
422-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug + MobileApps|Any CPU.ActiveCfg = Debug + MobileApps|Any CPU
423-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug + MobileApps|Any CPU.Build.0 = Debug + MobileApps|Any CPU
424-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug + MobileApps|ARM.ActiveCfg = Debug + MobileApps|Any CPU
425-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug + MobileApps|ARM.Build.0 = Debug + MobileApps|Any CPU
426-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug + MobileApps|ARM64.ActiveCfg = Debug + MobileApps|Any CPU
427-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug + MobileApps|ARM64.Build.0 = Debug + MobileApps|Any CPU
428-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug + MobileApps|iPhone.ActiveCfg = Debug + MobileApps|Any CPU
429-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug + MobileApps|iPhone.Build.0 = Debug + MobileApps|Any CPU
430-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug + MobileApps|iPhoneSimulator.ActiveCfg = Debug + MobileApps|Any CPU
431-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug + MobileApps|iPhoneSimulator.Build.0 = Debug + MobileApps|Any CPU
432-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug + MobileApps|x64.ActiveCfg = Debug + MobileApps|Any CPU
433-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug + MobileApps|x64.Build.0 = Debug + MobileApps|Any CPU
434-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug + MobileApps|x86.ActiveCfg = Debug + MobileApps|Any CPU
435-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug + MobileApps|x86.Build.0 = Debug + MobileApps|Any CPU
436-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
437-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
438-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug|ARM.ActiveCfg = Debug|Any CPU
439-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug|ARM.Build.0 = Debug|Any CPU
440-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug|ARM64.ActiveCfg = Debug|Any CPU
441-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug|ARM64.Build.0 = Debug|Any CPU
442-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
443-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug|iPhone.Build.0 = Debug|Any CPU
444-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
445-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
446-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug|x64.ActiveCfg = Debug|Any CPU
447-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug|x64.Build.0 = Debug|Any CPU
448-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug|x86.ActiveCfg = Debug|Any CPU
449-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Debug|x86.Build.0 = Debug|Any CPU
450-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
451-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Release|Any CPU.Build.0 = Release|Any CPU
452-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Release|ARM.ActiveCfg = Release|Any CPU
453-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Release|ARM.Build.0 = Release|Any CPU
454-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Release|ARM64.ActiveCfg = Release|Any CPU
455-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Release|ARM64.Build.0 = Release|Any CPU
456-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Release|iPhone.ActiveCfg = Release|Any CPU
457-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Release|iPhone.Build.0 = Release|Any CPU
458-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
459-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
460-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Release|x64.ActiveCfg = Release|Any CPU
461-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Release|x64.Build.0 = Release|Any CPU
462-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Release|x86.ActiveCfg = Release|Any CPU
463-
{8672FC71-00DE-491D-BCEB-101A2A7887E6}.Release|x86.Build.0 = Release|Any CPU
464416
{3C21354D-601A-4902-A728-419C70891338}.Debug + MobileApps|Any CPU.ActiveCfg = Debug + MobileApps|Any CPU
465417
{3C21354D-601A-4902-A728-419C70891338}.Debug + MobileApps|Any CPU.Build.0 = Debug + MobileApps|Any CPU
466418
{3C21354D-601A-4902-A728-419C70891338}.Debug + MobileApps|ARM.ActiveCfg = Debug + MobileApps|Any CPU
@@ -1751,7 +1703,6 @@ Global
17511703
{18559D36-C735-4933-AA86-398C8222D4F6} = {9B0B5396-4D95-4C15-82ED-DC22B5A3123F}
17521704
{58B95AA7-BE17-40F2-9C9A-FA27C282A10A} = {9B0B5396-4D95-4C15-82ED-DC22B5A3123F}
17531705
{408DCC1C-E810-4F9F-94EE-8421715A3661} = {58B95AA7-BE17-40F2-9C9A-FA27C282A10A}
1754-
{8672FC71-00DE-491D-BCEB-101A2A7887E6} = {58B95AA7-BE17-40F2-9C9A-FA27C282A10A}
17551706
{3C21354D-601A-4902-A728-419C70891338} = {58B95AA7-BE17-40F2-9C9A-FA27C282A10A}
17561707
{B6BE589B-1DBB-4C36-803F-6D425723FA74} = {58B95AA7-BE17-40F2-9C9A-FA27C282A10A}
17571708
{2EAA7878-3E2A-4355-9841-430BF45EA8BD} = {58B95AA7-BE17-40F2-9C9A-FA27C282A10A}

‎src/client/Microsoft.Identity.Client/json/.editorconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,5 @@ dotnet_diagnostic.CS0108.severity = none
2626

2727
# IDE0036: Order modifiers
2828
dotnet_diagnostic.IDE0036.severity = none
29+
30+
dotnet_diagnostic.VSTHRD200.severity = none

‎tests/CacheCompat/CommonCache.Test.Common/CommonCache.Test.Common.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="CommandLineParser" Version="2.9.1" />
12-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
11+
<PackageReference Include="CommandLineParser" />
12+
<PackageReference Include="Newtonsoft.Json" />
1313
</ItemGroup>
1414

1515
</Project>

‎tests/CacheCompat/CommonCache.Test.MsalJava/CommonCache.Test.MsalJava.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
<ItemGroup>
99
<ProjectReference Include="..\CommonCache.Test.Common\CommonCache.Test.Common.csproj" />
10-
<PackageReference Include="CommandLineParser" version="2.9.1" />
11-
<PackageReference Include="Newtonsoft.Json" version="13.0.1" />
10+
<PackageReference Include="CommandLineParser"/>
11+
<PackageReference Include="Newtonsoft.Json" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎tests/CacheCompat/CommonCache.Test.MsalV2/App.config

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎tests/CacheCompat/CommonCache.Test.MsalV2/CommonCache.Test.MsalV2.csproj

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎tests/CacheCompat/CommonCache.Test.MsalV2/FileBasedTokenCacheHelper.cs

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎tests/CacheCompat/CommonCache.Test.MsalV2/Program.cs

Lines changed: 0 additions & 88 deletions
This file was deleted.

0 commit comments

Comments
 (0)