From 381bf42d003e8fae25e1b6843ad87816b029ce27 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 10 Dec 2019 16:31:01 +0000 Subject: [PATCH 1/3] Merge pull request 4763 from darc-internal/release/3.1-ffe069f6-6bc7-47f8-b6be-d7dc8bba520c into internal/release/3.1 --- NuGet.config | 1 + azure-pipelines.yml | 54 +++++++++++++++++++++++++++++++++++++-- eng/Version.Details.xml | 12 ++++----- eng/Versions.props | 4 +-- eng/scripts/CodeCheck.ps1 | 19 ++++++++++---- 5 files changed, 75 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 242cc58e70f..4d6b0890ecd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,7 @@ + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e62fc3c035a..0184b10cec2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,6 +11,14 @@ variables: value: true - name: _DotNetArtifactsCategory value: ASPNETEXTENSIONS + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - group: DotNet-MSRC-Storage + - name: _InternalRuntimeDownloadArgs + value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet + /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) + - ${{ if eq(variables['System.TeamProject'], 'public') }}: + - name: _InternalRuntimeDownloadArgs + value: '' # used for post-build phases, internal builds only - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: @@ -42,7 +50,15 @@ stages: pool: vmImage: vs2017-win2016 steps: - - powershell: . ./activate.ps1; ./restore.cmd -ci; ./eng/scripts/CodeCheck.ps1 -ci + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - powershell: . ./activate.ps1; ./restore.cmd -ci $(_InternalRuntimeDownloadArgs); ./eng/scripts/CodeCheck.ps1 -ci displayName: Run eng/scripts/CodeCheck.ps1 - template: /eng/common/templates/jobs/jobs.yml @@ -111,7 +127,15 @@ stages: inputs: command: custom arguments: 'locals all -clear' - - script: eng\common\cibuild.cmd -configuration $(_BuildConfig) -prepareMachine $(_BuildArgs) + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: eng\common\cibuild.cmd -configuration $(_BuildConfig) -prepareMachine $(_BuildArgs) $(_InternalRuntimeDownloadArgs) displayName: Build and Publish - script: eng\scripts\ci-flaky-tests.cmd -configuration $(_BuildConfig) displayName: Run Flaky Tests @@ -176,11 +200,20 @@ stages: displayName: Install Node 10.x inputs: versionSpec: 10.x + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine -p:BuildNodeJS=true $(_OfficialBuildArgs) + $(_InternalRuntimeDownloadArgs) displayName: Build - script: eng/scripts/ci-flaky-tests.sh --configuration $(_BuildConfig) displayName: Run Flaky Tests @@ -232,9 +265,18 @@ stages: steps: - checkout: self clean: true + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine + $(_InternalRuntimeDownloadArgs) displayName: Build - script: eng/scripts/ci-flaky-tests.sh --configuration $(_BuildConfig) displayName: Run Flaky Tests @@ -268,6 +310,14 @@ stages: DotNetCoreSdkDir: $(Agent.ToolsDirectory)/dotnet DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: true steps: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - script: | source eng/common/native/common-library.sh mkdir -p $HOME/bin diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ae54198985..8e6fa77c8c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -66,17 +66,17 @@ Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. All Runtime.$rid packages should have the same version. --> - - https://github.com/dotnet/core-setup - f3f2dd583fffa254015fc21ff0e45784b333256d + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/core-setup - f3f2dd583fffa254015fc21ff0e45784b333256d + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e diff --git a/eng/Versions.props b/eng/Versions.props index 135716e54c1..9af36522d23 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ 3.1.0 - 3.1.1-servicing.19576.9 - 3.1.1-servicing.19576.9 + 3.1.1 + 3.1.1-servicing.19608.4 2.1.0 1.1.0 diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index 6c0ecf89b63..44c03626c74 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -97,11 +97,20 @@ try { } Write-Host "git diff" - & git diff --ignore-space-at-eol --exit-code - if ($LastExitCode -ne 0) { - $status = git status -s | Out-String - $status = $status -replace "`n","`n " - LogError "Generated code is not up to date. You might need to regenerate the reference assemblies or project list (see docs/ReferenceAssemblies.md and docs/ReferenceResolution.md)" + + # Redirect stderr to stdout because PowerShell does not consistently handle output to stderr + $changedFiles = & cmd /c 'git --no-pager diff --ignore-space-change --name-only 2>nul' + + # Temporary: Disable check for NuGet.config + $changedFilesExclusion = "NuGet.config" + + if ($changedFiles) { + foreach ($file in $changedFiles) { + if ($file -eq $changedFilesExclusion) {continue} + $filePath = Resolve-Path "${repoRoot}/${file}" + LogError "Generated code is not up to date in $file. You might need to regenerate the reference assemblies or project list (see docs/ReferenceAssemblies.md and docs/ReferenceResolution.md)" -filepath $filePath + & git --no-pager diff --ignore-space-change $filePath + } } } finally { From 3b45e44f0b9c13a08f7ab3e1a899d09e88abb0b2 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 13 Jan 2020 23:59:43 -0800 Subject: [PATCH 2/3] Update branding to 3.1.2 --- NuGet.config | 1 - eng/Versions.props | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4d6b0890ecd..242cc58e70f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,6 @@ - diff --git a/eng/Versions.props b/eng/Versions.props index 27ad93df98a..4451b25e83a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 3 1 - 1 + 2 $(MajorVersion).$(MinorVersion).$(PatchVersion) servicing $(VersionPrefix).0 From acba1f5322740f6f3bbca44d8f774567c2623b1c Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 14 Jan 2020 17:18:46 -0800 Subject: [PATCH 3/3] Update baselines --- eng/Baseline.Designer.props | 452 ++++++++++++++++++------------------ eng/Baseline.xml | 108 ++++----- 2 files changed, 280 insertions(+), 280 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 972ca371454..582313ea0d9 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -6,221 +6,221 @@ - 3.0.1 + 3.0.2 - + - + - 3.0.1 + 3.0.2 - - - - + + + + - - - - + + + + - 3.0.1 + 3.0.2 - - + + - 3.0.1 + 3.0.2 - - + + - 3.0.1 + 3.0.2 - + - + - 3.0.1 + 3.0.2 - + - + - 3.0.1 + 3.0.2 - - + + - 3.0.1 + 3.0.2 - + - + - 3.0.1 + 3.0.2 - + - + - 3.0.1 + 3.0.2 - + - + - 3.0.1 + 3.0.2 - - + + - - + + - 3.0.1 + 3.0.2 - - + + - - + + - 3.0.1 + 3.0.2 - - + + - - + + - 3.0.1 + 3.0.2 - - + + - - + + - 3.0.1 + 3.0.2 - - + + - 3.0.1 + 3.0.2 - + - + - 3.0.1 + 3.0.2 - - + + - - + + - 3.0.1 + 3.0.2 - + - + - + - 3.0.1 + 3.0.2 - 3.0.1 + 3.0.2 - + - 3.0.1 + 3.0.2 @@ -233,337 +233,337 @@ - 3.0.1 + 3.0.2 - - - + + + - - - + + + - 3.0.1 + 3.0.2 - 3.0.1 + 3.0.2 - + - + - 3.0.1 + 3.0.2 - + - + - 3.0.1 + 3.0.2 - + - + - 3.0.1 + 3.0.2 - - + + - - + + - 3.0.1 + 3.0.2 - 3.0.1 + 3.0.2 - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - 3.0.1 + 3.0.2 - - - - + + + + - - - - + + + + - 3.0.1 + 3.0.2 - + - 3.0.1 + 3.0.2 - - + + - 3.0.1 + 3.0.2 - - - + + + - - - + + + - 3.0.1 + 3.0.2 - + - 3.0.1 + 3.0.2 - - - - + + + + - - - - + + + + - 3.0.1 + 3.0.2 - 3.0.1 + 3.0.2 - - - - + + + + - - - - + + + + - 3.0.1 + 3.0.2 - 3.0.1 + 3.0.2 - - - - - + + + + + - 3.0.1 + 3.0.2 - - + + - - + + - 3.0.1 + 3.0.2 - - - + + + - - - + + + - 3.0.1 + 3.0.2 - + - + - 3.0.1 + 3.0.2 - + - + - + - 3.0.1 + 3.0.2 - + - + - 3.0.1 + 3.0.2 - + - + - 3.0.1 + 3.0.2 - 3.0.1 + 3.0.2 - - + + - - + + - 3.0.1 + 3.0.2 - - - - + + + + - - - - + + + + - 3.0.1 + 3.0.2 - - + + - - + + - 3.0.1 + 3.0.2 @@ -572,20 +572,20 @@ - 3.0.1 + 3.0.2 - - + + - - + + - 3.0.1 + 3.0.2 @@ -593,9 +593,9 @@ - 3.0.0 + 3.0.2 - + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index d93368f318d..60ba72a540f 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -5,57 +5,57 @@ build of Extensions. Update this list when preparing for a new patch. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file