[master] Update dependencies from dotnet/arcade aspnet/EntityFrameworkCore (#17513)

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191201.1

- Microsoft.EntityFrameworkCore.Tools - 5.0.0-alpha.1.19601.1
- Microsoft.EntityFrameworkCore.SqlServer - 5.0.0-alpha.1.19601.1
- dotnet-ef - 5.0.0-alpha.1.19601.1
- Microsoft.EntityFrameworkCore - 5.0.0-alpha.1.19601.1
- Microsoft.EntityFrameworkCore.InMemory - 5.0.0-alpha.1.19601.1
- Microsoft.EntityFrameworkCore.Relational - 5.0.0-alpha.1.19601.1
- Microsoft.EntityFrameworkCore.Sqlite - 5.0.0-alpha.1.19601.1

* Update dependencies from https://github.com/dotnet/arcade build 20191201.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19601.1
- Microsoft.DotNet.GenAPI - 5.0.0-beta.19601.1
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19601.1

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191202.1

- Microsoft.EntityFrameworkCore.Tools - 5.0.0-alpha.1.19602.1
- Microsoft.EntityFrameworkCore.SqlServer - 5.0.0-alpha.1.19602.1
- dotnet-ef - 5.0.0-alpha.1.19602.1
- Microsoft.EntityFrameworkCore - 5.0.0-alpha.1.19602.1
- Microsoft.EntityFrameworkCore.InMemory - 5.0.0-alpha.1.19602.1
- Microsoft.EntityFrameworkCore.Relational - 5.0.0-alpha.1.19602.1
- Microsoft.EntityFrameworkCore.Sqlite - 5.0.0-alpha.1.19602.1
This commit is contained in:
dotnet-maestro[bot] 2019-12-02 15:51:37 +00:00 коммит произвёл GitHub
Родитель 032625cd32
Коммит 84496d3c95
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
7 изменённых файлов: 59 добавлений и 41 удалений

Просмотреть файл

@ -29,33 +29,33 @@
<Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
<Sha>a3a180d5ddd3934bd61448c18484e2ecc9397d9c</Sha>
</Dependency>
<Dependency Name="dotnet-ef" Version="5.0.0-alpha.1.19578.1">
<Dependency Name="dotnet-ef" Version="5.0.0-alpha.1.19602.1">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>db9552ccf0d5794ded37e2e6705e26b466372692</Sha>
<Sha>6b6372331cbbafad783b1a348968309fdd77ee43</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0-alpha.1.19578.1">
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0-alpha.1.19602.1">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>db9552ccf0d5794ded37e2e6705e26b466372692</Sha>
<Sha>6b6372331cbbafad783b1a348968309fdd77ee43</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0-alpha.1.19578.1">
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0-alpha.1.19602.1">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>db9552ccf0d5794ded37e2e6705e26b466372692</Sha>
<Sha>6b6372331cbbafad783b1a348968309fdd77ee43</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0-alpha.1.19578.1">
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0-alpha.1.19602.1">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>db9552ccf0d5794ded37e2e6705e26b466372692</Sha>
<Sha>6b6372331cbbafad783b1a348968309fdd77ee43</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0-alpha.1.19578.1">
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0-alpha.1.19602.1">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>db9552ccf0d5794ded37e2e6705e26b466372692</Sha>
<Sha>6b6372331cbbafad783b1a348968309fdd77ee43</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0-alpha.1.19578.1">
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0-alpha.1.19602.1">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>db9552ccf0d5794ded37e2e6705e26b466372692</Sha>
<Sha>6b6372331cbbafad783b1a348968309fdd77ee43</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.0-alpha.1.19578.1">
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.0-alpha.1.19602.1">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>db9552ccf0d5794ded37e2e6705e26b466372692</Sha>
<Sha>6b6372331cbbafad783b1a348968309fdd77ee43</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Analyzer.Testing" Version="5.0.0-alpha1.19578.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
<Uri>https://github.com/aspnet/Extensions</Uri>
@ -412,17 +412,17 @@
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>7a85adc13f3d2fe7712a7bfd3cef8691ea78ba61</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19574.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19601.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87b59e17420bf0c3341edacbd8a6721e619afbac</Sha>
<Sha>c0b56ff3569e3c7475070486c40543ea4c6f6dc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19574.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19601.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87b59e17420bf0c3341edacbd8a6721e619afbac</Sha>
<Sha>c0b56ff3569e3c7475070486c40543ea4c6f6dc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19574.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19601.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87b59e17420bf0c3341edacbd8a6721e619afbac</Sha>
<Sha>c0b56ff3569e3c7475070486c40543ea4c6f6dc7</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Testing" Version="5.0.0-alpha1.19578.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
<Uri>https://github.com/aspnet/Extensions</Uri>

Просмотреть файл

@ -60,7 +60,7 @@
-->
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.19574.1</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.19601.1</MicrosoftDotNetGenAPIPackageVersion>
<!-- Packages from dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>3.4.0-beta1-19456-03</MicrosoftNetCompilersToolsetPackageVersion>
<!-- Packages from dotnet/core-setup -->
@ -158,13 +158,13 @@
<MicrosoftJSInteropPackageVersion>5.0.0-alpha1.19578.1</MicrosoftJSInteropPackageVersion>
<MonoWebAssemblyInteropPackageVersion>5.0.0-preview3.19578.1</MonoWebAssemblyInteropPackageVersion>
<!-- Packages from aspnet/EntityFrameworkCore -->
<dotnetefPackageVersion>5.0.0-alpha.1.19578.1</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.0-alpha.1.19578.1</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.0-alpha.1.19578.1</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.0-alpha.1.19578.1</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.0-alpha.1.19578.1</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-alpha.1.19578.1</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>5.0.0-alpha.1.19578.1</MicrosoftEntityFrameworkCorePackageVersion>
<dotnetefPackageVersion>5.0.0-alpha.1.19602.1</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.0-alpha.1.19602.1</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.0-alpha.1.19602.1</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.0-alpha.1.19602.1</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.0-alpha.1.19602.1</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-alpha.1.19602.1</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>5.0.0-alpha.1.19602.1</MicrosoftEntityFrameworkCorePackageVersion>
<!-- Packages from aspnet/AspNetCore-Tooling -->
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>5.0.0-alpha.1.19578.7</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
<MicrosoftAspNetCoreRazorLanguagePackageVersion>5.0.0-alpha.1.19578.7</MicrosoftAspNetCoreRazorLanguagePackageVersion>

Просмотреть файл

@ -112,17 +112,18 @@ function Build {
@properties
}
if ($clean) {
if(Test-Path $ArtifactsDir) {
Remove-Item -Recurse -Force $ArtifactsDir
Write-Host 'Artifacts directory deleted.'
}
exit 0
}
try {
. $PSScriptRoot\tools.ps1
If ((Test-Path variable:LastExitCode) -And ($LastExitCode -ne 0)) {
if ($clean) {
if (Test-Path $ArtifactsDir) {
Remove-Item -Recurse -Force $ArtifactsDir
Write-Host 'Artifacts directory deleted.'
}
exit 0
}
if ((Test-Path variable:LastExitCode) -And ($LastExitCode -ne 0)) {
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message 'Eng/common/tools.ps1 returned a non-zero exit code.'
ExitWithExitCode $LastExitCode
}

Просмотреть файл

@ -49,6 +49,10 @@ variables:
- name: NetCore_31_Blazor_Features_Channel_Id
value: 531
# .NET Core Experimental
- name: NetCore_Experimental_Channel_Id
value: 562
# Whether the build is internal or not
- name: IsInternalBuild
value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }}

Просмотреть файл

@ -207,4 +207,17 @@ stages:
channelId: 551
transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json'
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json'
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal-symbols/nuget/v3/index.json'
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal-symbols/nuget/v3/index.json'
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
parameters:
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
dependsOn: ${{ parameters.publishDependsOn }}
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
stageName: 'NETCore_Experimental_Publishing'
channelName: '.NET Core Experimental'
channelId: 562
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json'
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json'
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental-symbols/nuget/v3/index.json'

Просмотреть файл

@ -247,7 +247,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
if ($msbuildCmd -ne $null) {
# Workaround for https://github.com/dotnet/roslyn/issues/35793
# Due to this issue $msbuildCmd.Version returns 0.0.0.0 for msbuild.exe 16.2+
$msbuildVersion = [Version]::new((Get-Item $msbuildCmd.Path).VersionInfo.ProductVersion.Split(@('-', '+'))[0])
$msbuildVersion = [Version]::new((Get-Item $msbuildCmd.Path).VersionInfo.ProductVersion.Split([char[]]@('-', '+'))[0])
if ($msbuildVersion -ge $vsMinVersion) {
return $global:_MSBuildExe = $msbuildCmd.Path

Просмотреть файл

@ -25,7 +25,7 @@
},
"msbuild-sdks": {
"Yarn.MSBuild": "1.15.2",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19574.1",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19574.1"
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19601.1",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19601.1"
}
}