Skip to content

Commit c4305ff

Browse files
authored
Merge pull request #19655 from dotnet-maestro-bot/merge/release/5.0-preview2-to-master
[automated] Merge branch 'release/5.0-preview2' => 'master'
2 parents dd7fa11 + 19d4967 commit c4305ff

32 files changed

+13
-1306
lines changed

eng/Dependencies.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,6 @@ and are generated based on the last package release.
162162
<LatestPackageReference Include="IdentityServer4.Storage" Version="$(IdentityServer4StoragePackageVersion)" />
163163
<LatestPackageReference Include="Libuv" Version="$(LibuvPackageVersion)" />
164164
<LatestPackageReference Include="MessagePack" Version="$(MessagePackPackageVersion)" />
165-
<LatestPackageReference Include="Microsoft.Azure.KeyVault" Version="$(MicrosoftAzureKeyVaultPackageVersion)" />
166-
<LatestPackageReference Include="Microsoft.Azure.Storage.Blob" Version="$(MicrosoftAzureStorageBlobPackageVersion)" />
167-
<LatestPackageReference Include="Microsoft.Data.OData" Version="$(MicrosoftDataODataPackageVersion)" />
168-
<LatestPackageReference Include="Microsoft.Data.Services.Client" Version="$(MicrosoftDataServicesClientPackageVersion)" />
169165
<LatestPackageReference Include="Mono.Cecil" Version="$(MonoCecilPackageVersion)" />
170166
<LatestPackageReference Include="Moq" Version="$(MoqPackageVersion)" />
171167
<LatestPackageReference Include="Newtonsoft.Json.Bson" Version="$(NewtonsoftJsonBsonPackageVersion)" />

eng/ProjectReferences.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
<Project>
77
<ItemGroup>
88
<ProjectReferenceProvider Include="Microsoft.AspNetCore.JsonPatch" ProjectPath="$(RepoRoot)src\Features\JsonPatch\src\Microsoft.AspNetCore.JsonPatch.csproj" />
9-
<ProjectReferenceProvider Include="Microsoft.AspNetCore.DataProtection.AzureKeyVault" ProjectPath="$(RepoRoot)src\DataProtection\AzureKeyVault\src\Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj" />
10-
<ProjectReferenceProvider Include="Microsoft.AspNetCore.DataProtection.AzureStorage" ProjectPath="$(RepoRoot)src\DataProtection\AzureStorage\src\Microsoft.AspNetCore.DataProtection.AzureStorage.csproj" />
119
<ProjectReferenceProvider Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" ProjectPath="$(RepoRoot)src\DataProtection\EntityFrameworkCore\src\Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.csproj" />
1210
<ProjectReferenceProvider Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" ProjectPath="$(RepoRoot)src\DataProtection\StackExchangeRedis\src\Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj" />
1311
<ProjectReferenceProvider Include="Microsoft.AspNetCore.TestHost" ProjectPath="$(RepoRoot)src\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj" />

eng/Versions.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,6 @@
189189
<MicrosoftAspNetWebApiClientPackageVersion>5.2.6</MicrosoftAspNetWebApiClientPackageVersion>
190190
<MonoWebAssemblyInteropPackageVersion>3.1.1-preview4.19614.4</MonoWebAssemblyInteropPackageVersion>
191191
<!-- Partner teams -->
192-
<MicrosoftAzureKeyVaultPackageVersion>2.3.2</MicrosoftAzureKeyVaultPackageVersion>
193-
<MicrosoftAzureStorageBlobPackageVersion>10.0.1</MicrosoftAzureStorageBlobPackageVersion>
194192
<MicrosoftBclAsyncInterfacesPackageVersion>1.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
195193
<MicrosoftBuildPackageVersion>15.8.166</MicrosoftBuildPackageVersion>
196194
<MicrosoftAzureSignalRPackageVersion>1.2.0</MicrosoftAzureSignalRPackageVersion>
@@ -200,8 +198,6 @@
200198
<MicrosoftCodeAnalysisCommonPackageVersion>3.0.0</MicrosoftCodeAnalysisCommonPackageVersion>
201199
<MicrosoftCodeAnalysisCSharpPackageVersion>3.0.0</MicrosoftCodeAnalysisCSharpPackageVersion>
202200
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>3.0.0</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
203-
<MicrosoftDataODataPackageVersion>5.8.4</MicrosoftDataODataPackageVersion>
204-
<MicrosoftDataServicesClientPackageVersion>5.8.4</MicrosoftDataServicesClientPackageVersion>
205201
<MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>3.19.8</MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>
206202
<MicrosoftIdentityModelLoggingPackageVersion>5.5.0</MicrosoftIdentityModelLoggingPackageVersion>
207203
<MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>5.5.0</MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>

eng/scripts/RunHelix.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ param(
2525
[Parameter(Mandatory=$true)]
2626
[string]$Project,
2727
[string]$HelixQueues = "Windows.10.Amd64.Open",
28+
[string]$TargetArchitecture = "",
2829
[bool]$RunQuarantinedTests = $false
2930
)
3031
$ErrorActionPreference = 'Stop'
@@ -38,4 +39,4 @@ $env:BUILD_REPOSITORY_NAME="aspnetcore"
3839
$env:SYSTEM_TEAMPROJECT="aspnetcore"
3940

4041
$HelixQueues = $HelixQueues -replace ";", "%3B"
41-
dotnet msbuild $Project /t:Helix /p:IsRequiredCheck=true /p:IsHelixDaily=true /p:HelixTargetQueues=$HelixQueues /p:RunQuarantinedTests=$RunQuarantinedTests /p:_UseHelixOpenQueues=true
42+
dotnet msbuild $Project /t:Helix /p:TargetArchitecture="$TargetArchitecture" /p:IsRequiredCheck=true /p:IsHelixDaily=true /p:HelixTargetQueues=$HelixQueues /p:RunQuarantinedTests=$RunQuarantinedTests /p:_UseHelixOpenQueues=true

src/DataProtection/AzureKeyVault/src/AzureDataProtectionBuilderExtensions.cs

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

src/DataProtection/AzureKeyVault/src/AzureKeyVaultXmlDecryptor.cs

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

src/DataProtection/AzureKeyVault/src/AzureKeyVaultXmlEncryptor.cs

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

src/DataProtection/AzureKeyVault/src/IKeyVaultWrappingClient.cs

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

src/DataProtection/AzureKeyVault/src/KeyVaultClientWrapper.cs

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

src/DataProtection/AzureKeyVault/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj

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

src/DataProtection/AzureKeyVault/src/Properties/AssemblyInfo.cs

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

0 commit comments

Comments
 (0)