From 84496d3c958e1e151c314dc14b5b4e590a812afa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 15:51:37 +0000 Subject: [PATCH] [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 --- eng/Version.Details.xml | 40 +++++++++---------- eng/Versions.props | 16 ++++---- eng/common/build.ps1 | 19 ++++----- .../templates/post-build/common-variables.yml | 4 ++ .../templates/post-build/post-build.yml | 15 ++++++- eng/common/tools.ps1 | 2 +- global.json | 4 +- 7 files changed, 59 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1173c69d1a..1baf486f5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,33 +29,33 @@ https://github.com/aspnet/AspNetCore-Tooling a3a180d5ddd3934bd61448c18484e2ecc9397d9c - + https://github.com/aspnet/EntityFrameworkCore - db9552ccf0d5794ded37e2e6705e26b466372692 + 6b6372331cbbafad783b1a348968309fdd77ee43 - + https://github.com/aspnet/EntityFrameworkCore - db9552ccf0d5794ded37e2e6705e26b466372692 + 6b6372331cbbafad783b1a348968309fdd77ee43 - + https://github.com/aspnet/EntityFrameworkCore - db9552ccf0d5794ded37e2e6705e26b466372692 + 6b6372331cbbafad783b1a348968309fdd77ee43 - + https://github.com/aspnet/EntityFrameworkCore - db9552ccf0d5794ded37e2e6705e26b466372692 + 6b6372331cbbafad783b1a348968309fdd77ee43 - + https://github.com/aspnet/EntityFrameworkCore - db9552ccf0d5794ded37e2e6705e26b466372692 + 6b6372331cbbafad783b1a348968309fdd77ee43 - + https://github.com/aspnet/EntityFrameworkCore - db9552ccf0d5794ded37e2e6705e26b466372692 + 6b6372331cbbafad783b1a348968309fdd77ee43 - + https://github.com/aspnet/EntityFrameworkCore - db9552ccf0d5794ded37e2e6705e26b466372692 + 6b6372331cbbafad783b1a348968309fdd77ee43 https://github.com/aspnet/Extensions @@ -412,17 +412,17 @@ https://github.com/aspnet/Extensions 7a85adc13f3d2fe7712a7bfd3cef8691ea78ba61 - + https://github.com/dotnet/arcade - 87b59e17420bf0c3341edacbd8a6721e619afbac + c0b56ff3569e3c7475070486c40543ea4c6f6dc7 - + https://github.com/dotnet/arcade - 87b59e17420bf0c3341edacbd8a6721e619afbac + c0b56ff3569e3c7475070486c40543ea4c6f6dc7 - + https://github.com/dotnet/arcade - 87b59e17420bf0c3341edacbd8a6721e619afbac + c0b56ff3569e3c7475070486c40543ea4c6f6dc7 https://github.com/aspnet/Extensions diff --git a/eng/Versions.props b/eng/Versions.props index cd4d2a02b1..906b223fd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ --> - 5.0.0-beta.19574.1 + 5.0.0-beta.19601.1 3.4.0-beta1-19456-03 @@ -158,13 +158,13 @@ 5.0.0-alpha1.19578.1 5.0.0-preview3.19578.1 - 5.0.0-alpha.1.19578.1 - 5.0.0-alpha.1.19578.1 - 5.0.0-alpha.1.19578.1 - 5.0.0-alpha.1.19578.1 - 5.0.0-alpha.1.19578.1 - 5.0.0-alpha.1.19578.1 - 5.0.0-alpha.1.19578.1 + 5.0.0-alpha.1.19602.1 + 5.0.0-alpha.1.19602.1 + 5.0.0-alpha.1.19602.1 + 5.0.0-alpha.1.19602.1 + 5.0.0-alpha.1.19602.1 + 5.0.0-alpha.1.19602.1 + 5.0.0-alpha.1.19602.1 5.0.0-alpha.1.19578.7 5.0.0-alpha.1.19578.7 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index ce6882eead..0fd4d9c7f2 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -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 } diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 402dc40734..9505cf170f 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -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')) }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 7a4252a483..8a8d84f202 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -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' \ No newline at end of file + 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' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 26a6d03c8a..d762c9f044 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -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 diff --git a/global.json b/global.json index d4c00b509f..3155daf6cd 100644 --- a/global.json +++ b/global.json @@ -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" } }