projects / platform / upstream / dotnet / runtime.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 34883ec 1634a99)
Resolving conflicts
authorDriele Neves Ribeiro <t-drneve@microsoft.com>
Thu, 15 Feb 2018 19:24:36 +0000 (11:24 -0800)
committerDriele Neves Ribeiro <t-drneve@microsoft.com>
Thu, 15 Feb 2018 19:24:36 +0000 (11:24 -0800)
Commit migrated from https://github.com/dotnet/core-setup/commit/a094ee40128b7491120f25c822f36034a1fce7dc

1  2 
src/installer/buildpipeline/Core-Setup-Linux-BT.json patch | diff1 | diff2 | blob | history
src/installer/publish/dir.props patch | diff1 | diff2 | blob | history

diff --cc src/installer/buildpipeline/Core-Setup-Linux-BT.json
index 0fe694c,2a91d80..3960b1d
--- 1/src/installer/buildpipeline/Core-Setup-Linux-BT.json
--- 2/src/installer/buildpipeline/Core-Setup-Linux-BT.json
+++ b/src/installer/buildpipeline/Core-Setup-Linux-BT.json
@@@ -589,9 -589,9 +589,9 @@@
        "enabled": true,
        "continueOnError": false,
        "alwaysRun": false,
 -      "displayName": "Package - OpenSuse",
 +      "displayName": "Package Runtime Dep - OpenSuse",
        "timeoutInMinutes": 0,
-       "refName": "Task38",
+       "refName": "Task40",
        "task": {
          "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
          "versionSpec": "1.*",
@@@ -609,9 -609,9 +609,9 @@@
        "enabled": true,
        "continueOnError": false,
        "alwaysRun": false,
 -      "displayName": "Publish - OpenSuse",
 +      "displayName": "Publish Runtime Dep - OpenSuse",
        "timeoutInMinutes": 0,
-       "refName": "Task39",
+       "refName": "Task41",
        "task": {
          "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
          "versionSpec": "1.*",
diff --cc src/installer/publish/dir.props
Simple merge
Domain: Dotnet / Core;