Merge branch 'dev7x' into guardlogging

AzureAD · Jul 27, 2023 · d8c137c · d8c137c
2 parents 9715ff1 + f2e0763
commit d8c137c
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 12 deletions.
diff --git a/build/common.props b/build/common.props
@@ -32,7 +32,7 @@
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(SrcTargets)</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">$(SrcStandardTargets)</TargetFrameworks>
     <NetStandardImplicitPackageVersion>$(NetStandardVersion)</NetStandardImplicitPackageVersion>
-    <LangVersion>7.3</LangVersion>
+    <LangVersion>11</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">

diff --git a/...rosoft.IdentityModel.KeyVaultExtensions/Microsoft.IdentityModel.KeyVaultExtensions.csproj b/...rosoft.IdentityModel.KeyVaultExtensions/Microsoft.IdentityModel.KeyVaultExtensions.csproj
@@ -6,7 +6,6 @@
     <AssemblyName>Microsoft.IdentityModel.KeyVaultExtensions</AssemblyName>
     <Description>Includes types that provide support for signing and encrypting tokens with Azure Key Vault.</Description>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <LangVersion>latest</LangVersion>
     <PackageId>Microsoft.IdentityModel.KeyVaultExtensions</PackageId>
     <TargetFrameworks Condition="'$(TargetNet8)' == 'True'">netstandard2.0;net6.0;net8.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(TargetNet8)' != 'True'">netstandard2.0;net6.0</TargetFrameworks>

diff --git a/...odel.ManagedKeyVaultSecurityKey/Microsoft.IdentityModel.ManagedKeyVaultSecurityKey.csproj b/...odel.ManagedKeyVaultSecurityKey/Microsoft.IdentityModel.ManagedKeyVaultSecurityKey.csproj
@@ -7,7 +7,6 @@
     <Description>Includes types that provide support for signing and encrypting tokens with Azure Key Vault for 
     Applications that are using Managed identities for Azure resources.</Description>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <LangVersion>latest</LangVersion>
     <PackageId>Microsoft.IdentityModel.ManagedKeyVaultSecurityKey</PackageId>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <PackageTags>.NET;Windows;Authentication;Identity;Azure;Key;Vault;Extensions</PackageTags>
@@ -31,4 +30,4 @@
     <ProjectReference Include="..\Microsoft.IdentityModel.KeyVaultExtensions\Microsoft.IdentityModel.KeyVaultExtensions.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/src/Microsoft.IdentityModel.Protocols.SignedHttpRequest/SignedHttpRequestHandler.cs b/src/Microsoft.IdentityModel.Protocols.SignedHttpRequest/SignedHttpRequestHandler.cs
@@ -301,7 +301,7 @@ internal virtual void AddQClaim(Dictionary<string, object> payload, SignedHttpRe
                     if (!firstQueryParam)
                         stringBuffer.Append("&");
 
-                    stringBuffer.Append($"{queryParam.Key}={queryParam.Value}");
+                    stringBuffer.Append(queryParam.Key).Append('=').Append(queryParam.Value);
 
                     queryParamNameList.Add(queryParam.Key);
                     firstQueryParam = false;
@@ -343,7 +343,7 @@ internal virtual void AddHClaim(Dictionary<string, object> payload, SignedHttpRe
                     if (!firstHeader)
                         stringBuffer.Append(_newlineSeparator);
 
-                    stringBuffer.Append($"{headerName}: {header.Value}");
+                    stringBuffer.Append(headerName).Append(": ").Append(header.Value);
                     firstHeader = false;
                 }
 
@@ -848,7 +848,7 @@ internal virtual void ValidateQClaim(JsonWebToken signedHttpRequest, SignedHttpR
                         if (!firstQueryParam)
                             stringBuffer.Append("&");
 
-                        stringBuffer.Append($"{queryParamName}={queryParamsValue}");
+                        stringBuffer.Append(queryParamName).Append('=').Append(queryParamsValue);
                         firstQueryParam = false;
 
                         // remove the query param from the dictionary to mark it as covered.
@@ -916,7 +916,7 @@ internal virtual void ValidateHClaim(JsonWebToken signedHttpRequest, SignedHttpR
                         if (!firstHeader)
                             stringBuffer.Append(_newlineSeparator);
 
-                        stringBuffer.Append($"{headerName}: {headerValue}");
+                        stringBuffer.Append(headerName).Append(": ").Append(headerValue);
                         firstHeader = false;
 
                         // remove the header from the dictionary to mark it as covered.

diff --git a/src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj b/src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj
@@ -8,7 +8,6 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageId>Microsoft.IdentityModel.Tokens</PackageId>
     <PackageTags>.NET;Windows;Authentication;Identity;SecurityTokens;Cryptographic operations;Signing;Verifying Signatures;Encryption</PackageTags>
-    <LangVersion>latest</LangVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

diff --git a/...ityModel.KeyVaultExtensions.Tests/Microsoft.IdentityModel.KeyVaultExtensions.Tests.csproj b/...ityModel.KeyVaultExtensions.Tests/Microsoft.IdentityModel.KeyVaultExtensions.Tests.csproj
@@ -8,7 +8,6 @@
     <DelaySign>true</DelaySign>
     <Description>Tests for Microsoft.IdentityModel.KeyVaultExtensions</Description>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <LangVersion>latest</LangVersion>
     <PackageId>Microsoft.IdentityModel.KeyVaultExtensions.Tests</PackageId>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>

diff --git a/...KeyVaultSecurityKey.Tests/Microsoft.IdentityModel.ManagedKeyVaultSecurityKey.Tests.csproj b/...KeyVaultSecurityKey.Tests/Microsoft.IdentityModel.ManagedKeyVaultSecurityKey.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\build\commonTest.props" />
 
@@ -8,7 +8,6 @@
     <DelaySign>true</DelaySign>
     <Description>Tests for Microsoft.IdentityModel.ManagedKeyVaultSecurityKey</Description>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <LangVersion>latest</LangVersion>
     <PackageId>Microsoft.IdentityModel.ManagedKeyVaultSecurityKey.Tests</PackageId>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>