Skip to content
This repository was archived by the owner on Jul 30, 2024. It is now read-only.

Commit 2719026

Browse files
committed
Merge branch 'master' into dev
# Conflicts: # src/ArchivePackages/packages.config # src/NuGet.Jobs.Common/packages.config # src/NuGet.SupportRequests.Notifications/NuGet.SupportRequests.Notifications.csproj # src/Stats.CreateAzureCdnWarehouseReports/packages.config # src/Stats.ImportAzureCdnStatistics/packages.config # src/Tests.Logger/App.config # src/UpdateLicenseReports/packages.config # src/Validation.Callback.Vcs/Web.config # tests/Tests.Stats.CollectAzureCdnLogs/Tests.Stats.CollectAzureCdnLogs.csproj
2 parents c2b66be + ce50cff commit 2719026

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/Tests.Logger/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</dependentAssembly>
2424
<dependentAssembly>
2525
<assemblyIdentity name="Microsoft.Azure.KeyVault" publicKeyToken="31bf3856ad364e35" culture="neutral" />
26-
<bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" />
26+
<bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
2727
</dependentAssembly>
2828
<dependentAssembly>
2929
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform" publicKeyToken="31bf3856ad364e35" culture="neutral" />

src/Validation.Callback.Vcs/Web.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
-->
66
<configuration>
77
<appSettings>
8-
<add key="DataStorageAccount" value="UseDevelopmentStorage=True;" />
8+
<add key="DataStorageAccount" value="UseDevelopmentStorage=true" />
99
<add key="ContainerName" value="validation" />
1010
<add key="KeyVault:VaultName" value="" />
1111
<add key="KeyVault:ClientId" value="" />
@@ -52,7 +52,7 @@
5252
</dependentAssembly>
5353
<dependentAssembly>
5454
<assemblyIdentity name="Microsoft.Azure.KeyVault" publicKeyToken="31bf3856ad364e35" culture="neutral" />
55-
<bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" />
55+
<bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
5656
</dependentAssembly>
5757
<dependentAssembly>
5858
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform" publicKeyToken="31bf3856ad364e35" culture="neutral" />

0 commit comments

Comments
 (0)