Merge branch 'main' into alzollin/systemTextJson

build/pipeline-ci.yaml

@@ -1,8 +1,8 @@
-# CI builds should be triggered on the master branch only
+# CI builds should be triggered on the main branch only
 trigger:
   branches:
     include:
-    - 'master'
+    - 'main'
 
 pr: none
 

build/pipeline-perf-tests-automation.yaml

@@ -2,7 +2,7 @@
 trigger:
   branches:
     include:
-    - master
+    - main
   paths:
     include:
     - src/client/Microsoft.Identity.Client/*

build/pipeline-pullrequest.yaml

@@ -6,7 +6,7 @@ pr:
   autoCancel: false
   branches:
     include:
-    - master
+    - main
 
 variables:
   BuildPlatform: 'any cpu'
@@ -19,4 +19,4 @@ variables:
 stages:
 - stage: MSALBuildAndTest
   jobs: #Build and stage projects
-  - template: template-build-and-run-all-tests.yaml
+  - template: template-build-and-run-all-tests.yaml

build/template-ios-appcenter-tests.yaml

@@ -35,10 +35,10 @@ steps:
     $secret = '$(AzureADIdentityDivisionTestAgentSecret)'
     $secret | Out-File $(System.ArtifactsDirectory)\drop\msalTests\Microsoft.Identity.Test.iOS.UIAutomation\bin\${{ parameters.DataFileDirectory }}\data.txt
   displayName: 'Get Credentials'
-- powershell: 'appcenter test run uitest --app "ADAL-DotNet/DotNet-Xamarin-iOS" --devices ADAL-DotNet/ios-12-plus --app-path $(System.ArtifactsDirectory)\Xamarin.iOS\XForms.iOS.ipa --test-series "master" --locale "en_US" --build-dir $(System.ArtifactsDirectory)\drop\msalTests\Microsoft.Identity.Test.iOS.UIAutomation\bin\${{ parameters.DataFileDirectory }} --uitest-tools-dir $(System.ArtifactsDirectory)\drop --include-category ConsolidateAppCenterTests --include data.txt --token b3f171ce2e9ed2cfc11b8748ea8c7d3e4c9d37f5'
+- powershell: 'appcenter test run uitest --app "ADAL-DotNet/DotNet-Xamarin-iOS" --devices ADAL-DotNet/ios-12-plus --app-path $(System.ArtifactsDirectory)\Xamarin.iOS\XForms.iOS.ipa --test-series "main" --locale "en_US" --build-dir $(System.ArtifactsDirectory)\drop\msalTests\Microsoft.Identity.Test.iOS.UIAutomation\bin\${{ parameters.DataFileDirectory }} --uitest-tools-dir $(System.ArtifactsDirectory)\drop --include-category ConsolidateAppCenterTests --include data.txt --token b3f171ce2e9ed2cfc11b8748ea8c7d3e4c9d37f5'
   displayName: 'Run App Center MSAL Tests (Fast)'
   condition: and(succeeded(), eq(variables['ConsolidateAppCenterTests'], 'true'),  eq(variables['RunTests'], 'true'))
 
-- powershell: 'appcenter test run uitest --app "ADAL-DotNet/DotNet-Xamarin-iOS" --devices ADAL-DotNet/ios-12-plus --app-path $(System.ArtifactsDirectory)\Xamarin.iOS\XForms.iOS.ipa --test-series "master" --locale "en_US" --build-dir $(System.ArtifactsDirectory)\drop\msalTests\Microsoft.Identity.Test.iOS.UIAutomation\bin\${{ parameters.DataFileDirectory }} --uitest-tools-dir $(System.ArtifactsDirectory)\drop --exclude-category ConsolidateAppCenterTests --include data.txt --token b3f171ce2e9ed2cfc11b8748ea8c7d3e4c9d37f5'
+- powershell: 'appcenter test run uitest --app "ADAL-DotNet/DotNet-Xamarin-iOS" --devices ADAL-DotNet/ios-12-plus --app-path $(System.ArtifactsDirectory)\Xamarin.iOS\XForms.iOS.ipa --test-series "main" --locale "en_US" --build-dir $(System.ArtifactsDirectory)\drop\msalTests\Microsoft.Identity.Test.iOS.UIAutomation\bin\${{ parameters.DataFileDirectory }} --uitest-tools-dir $(System.ArtifactsDirectory)\drop --exclude-category ConsolidateAppCenterTests --include data.txt --token b3f171ce2e9ed2cfc11b8748ea8c7d3e4c9d37f5'
   displayName: 'Run App Center MSAL Tests (Full)'
   condition: and(succeeded(), eq(variables['ConsolidateAppCenterTests'], 'false'),  eq(variables['RunTests'], 'true'))

src/client/Microsoft.Identity.Client.Desktop/Microsoft.Identity.Client.Desktop.csproj

@@ -23,7 +23,7 @@
     <Authors>Microsoft</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=844761</PackageProjectUrl>
-    <PackageReleaseNotes>The changelog is available at https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/blob/master/changelog.txt and the roadmap at https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki#roadmap </PackageReleaseNotes>
+    <PackageReleaseNotes>The changelog is available at https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/blob/main/changelog.txt and the roadmap at https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki#roadmap </PackageReleaseNotes>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Description>
       This package contains binaries needed to use the Windows broker and other features with MSAL on older platforms such as .NET Framework and .NET Core 3.x

src/client/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj

@@ -42,7 +42,7 @@
     <Authors>Microsoft</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=844761</PackageProjectUrl>
-    <PackageReleaseNotes>The changelog is available at https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/blob/master/changelog.txt. The roadmap at https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki#roadmap. To provide feedback, fill-in the survey at https://ncv.microsoft.com/JrXkdySi0m</PackageReleaseNotes>
+    <PackageReleaseNotes>The changelog is available at https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/blob/main/changelog.txt. The roadmap at https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki#roadmap. To provide feedback, fill-in the survey at https://ncv.microsoft.com/JrXkdySi0m</PackageReleaseNotes>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Description>
       This package contains the binaries of the Microsoft Authentication Library for .NET (MSAL.NET).