From 2a9dee2b041f5d43c06e23007085a9ee7f5b0906 Mon Sep 17 00:00:00 2001
From: dotnet-maestro <@dotnet-maestro>
Date: Tue, 25 Jun 2019 12:20:07 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20190624.24
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19324.24
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19324.24
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19324.24
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19324.24
---
eng/Version.Details.xml | 16 ++++++++--------
eng/Versions.props | 4 ++--
eng/common/sdl/packages.config | 2 +-
eng/common/templates/job/execute-sdl.yml | 2 +-
global.json | 4 ++--
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b479f99..944a365 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,21 +3,21 @@
-
+
https://github.com/dotnet/arcade
- 9946534da4f73e6242ca105f6798ab58119c9ab0
+ 062febd818fa51e82c7192782a6b6e6429cc81c8
-
+
https://github.com/dotnet/arcade
- 9946534da4f73e6242ca105f6798ab58119c9ab0
+ 062febd818fa51e82c7192782a6b6e6429cc81c8
-
+
https://github.com/dotnet/arcade
- 9946534da4f73e6242ca105f6798ab58119c9ab0
+ 062febd818fa51e82c7192782a6b6e6429cc81c8
-
+
https://github.com/dotnet/arcade
- 9946534da4f73e6242ca105f6798ab58119c9ab0
+ 062febd818fa51e82c7192782a6b6e6429cc81c8
https://github.com/dotnet/corefx
diff --git a/eng/Versions.props b/eng/Versions.props
index d8b1baa..48e6e13 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -14,8 +14,8 @@
false
- 2.2.0-beta.19323.4
- 1.0.0-beta.19323.4
+ 2.2.0-beta.19324.24
+ 1.0.0-beta.19324.24
2.5.1-beta.19278.1
4.6.0-preview7.19323.4
diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config
index b054737..fb9b712 100644
--- a/eng/common/sdl/packages.config
+++ b/eng/common/sdl/packages.config
@@ -1,4 +1,4 @@

-
+
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index acb4c55..39a8e80 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -36,7 +36,7 @@ jobs:
continueOnError: ${{ parameters.continueOnError }}
- ${{ if eq(parameters.overrideParameters, '') }}:
- powershell: eng/common/sdl/execute-all-sdl-tools.ps1
- -GuardianPackageName Microsoft.Guardian.Cli.0.3.2
+ -GuardianPackageName Microsoft.Guardian.Cli.0.6.0
-NugetPackageDirectory $(Build.SourcesDirectory)\.packages
-AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
${{ parameters.additionalParameters }}
diff --git a/global.json b/global.json
index 8cb842c..7788bc6 100644
--- a/global.json
+++ b/global.json
@@ -7,8 +7,8 @@
"python": "2.7.15"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19323.4",
- "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19323.4",
+ "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19324.24",
+ "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19324.24",
"Microsoft.Build.NoTargets": "1.0.53",
"Microsoft.Build.Traversal": "2.0.2"
}
--
2.7.4