From cc30f4e8fcd516c2742ebf35032266f89427550b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2019 14:29:55 -0700
Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/arcade
build 20191017.3 (#1916)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19517.3
---
eng/Version.Details.xml | 4 +--
eng/common/post-build/setup-maestro-vars.ps1 | 26 --------------------
global.json | 2 +-
3 files changed, 3 insertions(+), 29 deletions(-)
delete mode 100644 eng/common/post-build/setup-maestro-vars.ps1
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6853c9e94..9b01d32f8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,9 +3,9 @@
-
+
https://github.com/dotnet/arcade
- f70d1fca3d5d4045be75694006f1bee0e0aec572
+ a42a124635ce1a218309ecb31ec59d559cacb886
diff --git a/eng/common/post-build/setup-maestro-vars.ps1 b/eng/common/post-build/setup-maestro-vars.ps1
deleted file mode 100644
index d7f64dc63..000000000
--- a/eng/common/post-build/setup-maestro-vars.ps1
+++ /dev/null
@@ -1,26 +0,0 @@
-param(
- [Parameter(Mandatory=$true)][string] $ReleaseConfigsPath # Full path to ReleaseConfigs.txt asset
-)
-
-. $PSScriptRoot\post-build-utils.ps1
-
-try {
- $Content = Get-Content $ReleaseConfigsPath
-
- $BarId = $Content | Select -Index 0
-
- $Channels = ""
- $Content | Select -Index 1 | ForEach-Object { $Channels += "$_ ," }
-
- $IsStableBuild = $Content | Select -Index 2
-
- Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId
- Write-PipelineSetVariable -Name 'InitialChannels' -Value "$Channels"
- Write-PipelineSetVariable -Name 'IsStableBuild' -Value $IsStableBuild
-}
-catch {
- Write-Host $_
- Write-Host $_.Exception
- Write-Host $_.ScriptStackTrace
- ExitWithExitCode 1
-}
diff --git a/global.json b/global.json
index d37c8cdc9..de6453600 100644
--- a/global.json
+++ b/global.json
@@ -11,6 +11,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19510.3"
+ "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19517.3"
}
}
From 63b29e535850710939a01182b58657ef06ed4ec5 Mon Sep 17 00:00:00 2001
From: Pranav K
Date: Wed, 23 Oct 2019 14:50:36 -0700
Subject: [PATCH 2/3] Revert accidental deletion
---
eng/common/post-build/setup-maestro-vars.ps1 | 26 ++++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 eng/common/post-build/setup-maestro-vars.ps1
diff --git a/eng/common/post-build/setup-maestro-vars.ps1 b/eng/common/post-build/setup-maestro-vars.ps1
new file mode 100644
index 000000000..d7f64dc63
--- /dev/null
+++ b/eng/common/post-build/setup-maestro-vars.ps1
@@ -0,0 +1,26 @@
+param(
+ [Parameter(Mandatory=$true)][string] $ReleaseConfigsPath # Full path to ReleaseConfigs.txt asset
+)
+
+. $PSScriptRoot\post-build-utils.ps1
+
+try {
+ $Content = Get-Content $ReleaseConfigsPath
+
+ $BarId = $Content | Select -Index 0
+
+ $Channels = ""
+ $Content | Select -Index 1 | ForEach-Object { $Channels += "$_ ," }
+
+ $IsStableBuild = $Content | Select -Index 2
+
+ Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId
+ Write-PipelineSetVariable -Name 'InitialChannels' -Value "$Channels"
+ Write-PipelineSetVariable -Name 'IsStableBuild' -Value $IsStableBuild
+}
+catch {
+ Write-Host $_
+ Write-Host $_.Exception
+ Write-Host $_.ScriptStackTrace
+ ExitWithExitCode 1
+}
From 565cd7b05d6c92a9d99644af19ed5e83a1d7a768 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Wed, 23 Oct 2019 21:04:14 -0700
Subject: [PATCH 3/3] Rebrand for 3.1.0-preview3
- aspnet/AspNetCore-Internal#3281
---
eng/Versions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index 73b139e4e..a0e47b158 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,6 +1,6 @@
3.1.0
- preview2
+ preview3