diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets index f1d07bd9d..5eb5af4b1 100644 --- a/build/Microsoft.DotNet.Cli.Prepare.targets +++ b/build/Microsoft.DotNet.Cli.Prepare.targets @@ -62,7 +62,7 @@ - + diff --git a/build/Microsoft.DotNet.Cli.Publish.targets b/build/Microsoft.DotNet.Cli.Publish.targets index 66b3d84d3..9c66a492c 100644 --- a/build/Microsoft.DotNet.Cli.Publish.targets +++ b/build/Microsoft.DotNet.Cli.Publish.targets @@ -52,7 +52,7 @@ - + diff --git a/buildpipeline/DotNet-CLI-CentOS-x64.json b/buildpipeline/DotNet-CLI-CentOS-x64.json index 9f85070b4..a2a9fa9d8 100644 --- a/buildpipeline/DotNet-CLI-CentOS-x64.json +++ b/buildpipeline/DotNet-CLI-CentOS-x64.json @@ -69,7 +69,7 @@ "allowOverride": true }, "BuildArguments": { - "value": "--skip-prereqs --configuration $(BuildConfiguration) --docker centos --targets Default", + "value": "--skip-prereqs --configuration $(BuildConfiguration) --docker centos --targets Default /p:BranchName=sandbox", "allowOverride": true }, "CONNECTION_STRING": { @@ -89,7 +89,7 @@ "value": "dotnetcli" }, "ARTIFACT_STORAGE_CONTAINER": { - "value": "dotnet" + "value": "mlorbe" }, "CHECKSUM_STORAGE_KEY": { "value": "PassedViaPipeBuild" @@ -98,7 +98,7 @@ "value": "dotnetclichecksums" }, "CHECKSUM_STORAGE_CONTAINER": { - "value": "dotnet" + "value": "mlorbe" }, "CLIBUILD_SKIP_TESTS": { "value": "true", diff --git a/buildpipeline/DotNet-CLI-opensuse13.2-x64.json b/buildpipeline/DotNet-CLI-opensuse13.2-x64.json index cbaf3fdfc..c2c80915c 100644 --- a/buildpipeline/DotNet-CLI-opensuse13.2-x64.json +++ b/buildpipeline/DotNet-CLI-opensuse13.2-x64.json @@ -69,7 +69,7 @@ "allowOverride": true }, "BuildArguments": { - "value": "--skip-prereqs --configuration $(BuildConfiguration) --docker opensuse.13.2 --targets Default", + "value": "--skip-prereqs --configuration $(BuildConfiguration) --docker opensuse.13.2 --targets Default /p:BranchName=sandbox", "allowOverride": true }, "CONNECTION_STRING": { @@ -89,7 +89,7 @@ "value": "dotnetcli" }, "ARTIFACT_STORAGE_CONTAINER": { - "value": "dotnet" + "value": "mlorbe" }, "CHECKSUM_STORAGE_KEY": { "value": "PassedViaPipeBuild" @@ -98,7 +98,7 @@ "value": "dotnetclichecksums" }, "CHECKSUM_STORAGE_CONTAINER": { - "value": "dotnet" + "value": "mlorbe" }, "CLIBUILD_SKIP_TESTS": { "value": "true", diff --git a/buildpipeline/Dotnet-CLI-Debian8-x64.json b/buildpipeline/Dotnet-CLI-Debian8-x64.json index c5f1155d6..d125391a7 100644 --- a/buildpipeline/Dotnet-CLI-Debian8-x64.json +++ b/buildpipeline/Dotnet-CLI-Debian8-x64.json @@ -69,7 +69,7 @@ "allowOverride": true }, "BuildArguments": { - "value": "--skip-prereqs --configuration $(BuildConfiguration) --docker debian --targets Default", + "value": "--skip-prereqs --configuration $(BuildConfiguration) --docker debian --targets Default /p:BranchName=sandbox", "allowOverride": true }, "CONNECTION_STRING": { @@ -89,7 +89,7 @@ "value": "dotnetcli" }, "ARTIFACT_STORAGE_CONTAINER": { - "value": "dotnet" + "value": "mlorbe" }, "CHECKSUM_STORAGE_KEY": { "value": "PassedViaPipeBuild" @@ -98,7 +98,7 @@ "value": "dotnetclichecksums" }, "CHECKSUM_STORAGE_CONTAINER": { - "value": "dotnet" + "value": "mlorbe" }, "CLIBUILD_SKIP_TESTS": { "value": "true", diff --git a/buildpipeline/Dotnet-CLI-Fedora23-x64.json b/buildpipeline/Dotnet-CLI-Fedora23-x64.json index 2b4ae3ffd..8926d72b2 100644 --- a/buildpipeline/Dotnet-CLI-Fedora23-x64.json +++ b/buildpipeline/Dotnet-CLI-Fedora23-x64.json @@ -69,7 +69,7 @@ "allowOverride": true }, "BuildArguments": { - "value": "--skip-prereqs --configuration $(BuildConfiguration) --docker fedora.23 --targets Default", + "value": "--skip-prereqs --configuration $(BuildConfiguration) --docker fedora.23 --targets Default /p:BranchName=sandbox", "allowOverride": true }, "CONNECTION_STRING": { @@ -89,7 +89,7 @@ "value": "dotnetcli" }, "ARTIFACT_STORAGE_CONTAINER": { - "value": "dotnet" + "value": "mlorbe" }, "CHECKSUM_STORAGE_KEY": { "value": "PassedViaPipeBuild" @@ -98,7 +98,7 @@ "value": "dotnetclichecksums" }, "CHECKSUM_STORAGE_CONTAINER": { - "value": "dotnet" + "value": "mlorbe" }, "CLIBUILD_SKIP_TESTS": { "value": "true", diff --git a/buildpipeline/Dotnet-CLI-OSX-x64.json b/buildpipeline/Dotnet-CLI-OSX-x64.json index ebe393978..5d8c064b8 100644 --- a/buildpipeline/Dotnet-CLI-OSX-x64.json +++ b/buildpipeline/Dotnet-CLI-OSX-x64.json @@ -69,7 +69,7 @@ "allowOverride": true }, "BuildArguments": { - "value": "--skip-prereqs --configuration $(BuildConfiguration) --targets Default", + "value": "--skip-prereqs --configuration $(BuildConfiguration) --targets Default /p:BranchName=sandbox", "allowOverride": true }, "CONNECTION_STRING": { @@ -89,7 +89,7 @@ "value": "dotnetcli" }, "ARTIFACT_STORAGE_CONTAINER": { - "value": "dotnet" + "value": "mlorbe" }, "CHECKSUM_STORAGE_KEY": { "value": "PassedViaPipeBuild" @@ -98,7 +98,7 @@ "value": "dotnetclichecksums" }, "CHECKSUM_STORAGE_CONTAINER": { - "value": "dotnet" + "value": "mlorbe" }, "CLIBUILD_SKIP_TESTS": { "value": "true", diff --git a/buildpipeline/Dotnet-CLI-RHEL7-x64.json b/buildpipeline/Dotnet-CLI-RHEL7-x64.json index 76d6d4212..097342660 100644 --- a/buildpipeline/Dotnet-CLI-RHEL7-x64.json +++ b/buildpipeline/Dotnet-CLI-RHEL7-x64.json @@ -87,7 +87,7 @@ "allowOverride": true }, "BuildArguments": { - "value": "--skip-prereqs --configuration $(BuildConfiguration) --targets Default", + "value": "--skip-prereqs --configuration $(BuildConfiguration) --targets Default /p:BranchName=sandbox", "allowOverride": true }, "CONNECTION_STRING": { @@ -107,7 +107,7 @@ "value": "dotnetcli" }, "ARTIFACT_STORAGE_CONTAINER": { - "value": "dotnet" + "value": "mlorbe" }, "CHECKSUM_STORAGE_KEY": { "value": "PassedViaPipeBuild" @@ -116,7 +116,7 @@ "value": "dotnetclichecksums" }, "CHECKSUM_STORAGE_CONTAINER": { - "value": "dotnet" + "value": "mlorbe" }, "CLIBUILD_SKIP_TESTS": { "value": "true", diff --git a/buildpipeline/Dotnet-CLI-Signing-Windows-x64.json b/buildpipeline/Dotnet-CLI-Signing-Windows-x64.json index 96015afd2..56d87e9fc 100644 --- a/buildpipeline/Dotnet-CLI-Signing-Windows-x64.json +++ b/buildpipeline/Dotnet-CLI-Signing-Windows-x64.json @@ -315,7 +315,7 @@ "scriptType": "inlineScript", "scriptName": "", "arguments": "$(MygetApiKey)", - "inlineScript": "$NuGetExe = Join-Path $env:BUILD_REPOSITORY_LOCALPATH \".nuget\\nuget.exe\"\n\n& $NuGetExe push -Source https://dotnet.myget.org/F/dotnet-cli/ -ApiKey $args[0] artifacts\\$env:RID\\packages\\Microsoft*.nupkg", + "inlineScript": "$NuGetExe = Join-Path $env:BUILD_REPOSITORY_LOCALPATH \".nuget\\nuget.exe\"\n\n& $NuGetExe push -Source https://dotnet.myget.org/F/dotnet-cli-private/ -ApiKey $args[0] artifacts\\$env:RID\\packages\\Microsoft*.nupkg", "workingFolder": "", "failOnStandardError": "true" } @@ -333,7 +333,7 @@ }, "inputs": { "filename": "build.cmd", - "arguments": "/p:Configuration=$(BuildConfiguration) /t:Publish", + "arguments": "/p:Configuration=$(BuildConfiguration) /p:BranchName=sandbox /t:Publish", "modifyEnvironment": "false", "workingFolder": "", "failOnStandardError": "false" @@ -420,7 +420,7 @@ "value": "dotnetcli" }, "ARTIFACT_STORAGE_CONTAINER": { - "value": "dotnet" + "value": "mlorbe" }, "CONNECTION_STRING": { "value": "PassedViaPipeBuild" @@ -439,7 +439,7 @@ "value": "Microsoft .NET Core 1.0.1 - SDK 1.0.0 Preview 4 (x64)" }, "VS_FEED_URL": { - "value": "https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json" + "value": "https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-cli-test/nuget/v3/index.json" }, "VS_FEED_PASSWORD": { "value": null, @@ -456,7 +456,7 @@ "value": "dotnetclichecksums" }, "CHECKSUM_STORAGE_CONTAINER": { - "value": "dotnet" + "value": "mlorbe" }, "CLIBUILD_SKIP_TESTS": { "value": "true", diff --git a/buildpipeline/Dotnet-CLI-Signing-Windows-x86.json b/buildpipeline/Dotnet-CLI-Signing-Windows-x86.json index 0af351d0b..39429e805 100644 --- a/buildpipeline/Dotnet-CLI-Signing-Windows-x86.json +++ b/buildpipeline/Dotnet-CLI-Signing-Windows-x86.json @@ -266,7 +266,7 @@ }, "inputs": { "filename": "build.cmd", - "arguments": "-Architecture $(BuildArchitecture) /p:Configuration=$(BuildConfiguration) /t:Publish /v:normal", + "arguments": "-Architecture $(BuildArchitecture) /p:Configuration=$(BuildConfiguration) /p:BranchName=sandbox /t:Publish /v:normal", "modifyEnvironment": "false", "workingFolder": "", "failOnStandardError": "false" @@ -373,7 +373,7 @@ "value": "dotnetcli" }, "ARTIFACT_STORAGE_CONTAINER": { - "value": "dotnet" + "value": "mlorbe" }, "CONNECTION_STRING": { "value": "PassedViaPipeBuild" @@ -395,7 +395,7 @@ "value": "Microsoft .NET Core 1.0.1 - SDK 1.0.0 Preview 4 (x86)" }, "VS_FEED_URL": { - "value": "https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json" + "value": "https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-cli-test/nuget/v3/index.json" }, "VS_FEED_PASSWORD": { "value": null, @@ -408,7 +408,7 @@ "value": "dotnetclichecksums" }, "CHECKSUM_STORAGE_CONTAINER": { - "value": "dotnet" + "value": "mlorbe" }, "CLIBUILD_SKIP_TESTS": { "value": "true" diff --git a/buildpipeline/Dotnet-CLI-Ubuntu14.04-x64.json b/buildpipeline/Dotnet-CLI-Ubuntu14.04-x64.json index 69d490581..ba1b16245 100644 --- a/buildpipeline/Dotnet-CLI-Ubuntu14.04-x64.json +++ b/buildpipeline/Dotnet-CLI-Ubuntu14.04-x64.json @@ -69,7 +69,7 @@ "allowOverride": true }, "BuildArguments": { - "value": "--skip-prereqs --configuration $(BuildConfiguration) --docker ubuntu.14.04 --targets Default", + "value": "--skip-prereqs --configuration $(BuildConfiguration) --docker ubuntu.14.04 --targets Default /p:BranchName=sandbox /p:SkipPublishToDebianRepo=true", "allowOverride": true }, "CONNECTION_STRING": { @@ -101,7 +101,7 @@ "value": "dotnetcli" }, "ARTIFACT_STORAGE_CONTAINER": { - "value": "dotnet" + "value": "mlorbe" }, "CHECKSUM_STORAGE_KEY": { "value": "PassedViaPipeBuild" @@ -110,7 +110,7 @@ "value": "dotnetclichecksums" }, "CHECKSUM_STORAGE_CONTAINER": { - "value": "dotnet" + "value": "mlorbe" } }, "demands": [ diff --git a/buildpipeline/Dotnet-CLI-Ubuntu16.04-x64.json b/buildpipeline/Dotnet-CLI-Ubuntu16.04-x64.json index e6ffcd49c..9a660ed29 100644 --- a/buildpipeline/Dotnet-CLI-Ubuntu16.04-x64.json +++ b/buildpipeline/Dotnet-CLI-Ubuntu16.04-x64.json @@ -69,7 +69,7 @@ "allowOverride": true }, "BuildArguments": { - "value": "--skip-prereqs --configuration $(BuildConfiguration) --docker ubuntu.16.04 --targets Default", + "value": "--skip-prereqs --configuration $(BuildConfiguration) --docker ubuntu.16.04 --targets Default /p:BranchName=sandbox /p:SkipPublishToDebianRepo=true", "allowOverride": true }, "CONNECTION_STRING": { @@ -101,7 +101,7 @@ "value": "dotnetcli" }, "ARTIFACT_STORAGE_CONTAINER": { - "value": "dotnet" + "value": "mlorbe" }, "CHECKSUM_STORAGE_KEY": { "value": "PassedViaPipeBuild" @@ -110,7 +110,7 @@ "value": "dotnetclichecksums" }, "CHECKSUM_STORAGE_CONTAINER": { - "value": "dotnet" + "value": "mlorbe" } }, "demands": [