From d19b3f4b2e3d40d1c7b343df2a7fac4bfeed3cc9 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 8 Nov 2017 10:24:25 -0800 Subject: [PATCH 01/14] Correcting 'PUBLISH_TO_AZURE_BLOB' and 'PUBLISH_NUPKG_TO_AZURE_BLOB' Booleans - 'false' should not be conveyed by the empty string. --- build/Publish.targets | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/Publish.targets b/build/Publish.targets index efe45cd91..9e911318c 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -10,7 +10,7 @@ + Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' == 'true' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/> + Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' == 'true' AND '$(OS)' == 'Windows_NT' "/> + Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' == 'true' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/> From aa944444f61560c1e9b072d22aa9f6ca3506a354 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 8 Nov 2017 14:31:06 -0800 Subject: [PATCH 02/14] Update SDK to 2.0.2-vspre-20170927-1. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3f359e31f..1b18e6991 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ - 2.0.1-servicing-20170926-1 + 2.0.2-vspre-20170927-1 $(CLI_NETSDK_Version) 4.4.0-preview3-4475 From 04ac042451c1d5760ef98588d94467d0d11be228 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 8 Nov 2017 19:07:29 -0800 Subject: [PATCH 03/14] Changes in the Transport feed DLL requires our response; update Transport feed DLL version and base URL. Defining "BuildTasksFeedDll" & relevent 'UsingTask' no longer needed as PublishNupkgToTransportFeed.targets uses the imported Microsoft.DotNet.Build.Tasks.Feed.targets to locate the Feed DLL --- NuGet.Config | 3 +-- build.proj | 2 +- build/AzureInfo.props | 2 -- build/Microsoft.DotNet.Cli.tasks | 1 - .../publish/PublishNupkgToTransportFeed.targets | 17 ++++++----------- .../dotnet-cli-build/dotnet-cli-build.csproj | 2 +- dir.props | 1 - 7 files changed, 9 insertions(+), 19 deletions(-) diff --git a/NuGet.Config b/NuGet.Config index 9c645c984..95416b2f1 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -3,7 +3,7 @@ - + @@ -16,7 +16,6 @@ - diff --git a/build.proj b/build.proj index bac606d59..3f755df09 100644 --- a/build.proj +++ b/build.proj @@ -52,7 +52,7 @@ - + diff --git a/build/AzureInfo.props b/build/AzureInfo.props index 9f323b42b..b651458ee 100644 --- a/build/AzureInfo.props +++ b/build/AzureInfo.props @@ -15,7 +15,5 @@ $(TRANSPORTFEED_STORAGE_CONTAINER) dotnet-core $(TRANSPORTFEED_STORAGE_KEY) - $(TRANSPORTFEED_STORAGE_ACCOUNT) - dotnetfeed diff --git a/build/Microsoft.DotNet.Cli.tasks b/build/Microsoft.DotNet.Cli.tasks index 1c4bbac75..901a48f84 100644 --- a/build/Microsoft.DotNet.Cli.tasks +++ b/build/Microsoft.DotNet.Cli.tasks @@ -24,7 +24,6 @@ - diff --git a/build/publish/PublishNupkgToTransportFeed.targets b/build/publish/PublishNupkgToTransportFeed.targets index 2f41acfd1..939b02c01 100644 --- a/build/publish/PublishNupkgToTransportFeed.targets +++ b/build/publish/PublishNupkgToTransportFeed.targets @@ -1,28 +1,23 @@ + + - packages + https://dotnetfeed.blob.core.windows.net/$(TransportFeedContainerName)/index.json - - - + - + Overwrite="false" /> diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index 89dc0f323..c3413747d 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -29,6 +29,6 @@ - + diff --git a/dir.props b/dir.props index 7133cb74f..756fccc32 100644 --- a/dir.props +++ b/dir.props @@ -7,7 +7,6 @@ $(RepoRoot)/.nuget/packages $(RepoRoot)/build_projects/dotnet-cli-build/bin/dotnet-cli-build.dll - $(RepoRoot)/build_projects/dotnet-cli-build/bin/Microsoft.DotNet.Build.Tasks.Feed.dll true true From f85436d82d94075385eb2ee903ca7b7dce4ea546 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 8 Nov 2017 19:16:27 -0800 Subject: [PATCH 04/14] Updating SDK to 2.0.3-servicing-20171109-3 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 1b18e6991..20f5daa40 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ - 2.0.2-vspre-20170927-1 + 2.0.3-servicing-20171109-3 $(CLI_NETSDK_Version) 4.4.0-preview3-4475 From 7b593a8ec6ce0e0728e7687b380dd3a31f81560b Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 8 Nov 2017 19:42:41 -0800 Subject: [PATCH 05/14] Defining: "BuildTasksFeedToolVersion" --- build/DependencyVersions.props | 1 + build_projects/dotnet-cli-build/dotnet-cli-build.csproj | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 748b3d8fa..b4b597844 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -50,5 +50,6 @@ 1.0.27-prerelease-01723-01 2.0.0-preview2-25331-01 + 1.0.0-prerelease-02203-01 diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index c3413747d..86531abc4 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -29,6 +29,6 @@ - + From 95f30e3becc9d2d1061a44887781cd91f4b8bbfa Mon Sep 17 00:00:00 2001 From: John Beisner Date: Thu, 9 Nov 2017 09:30:11 -0800 Subject: [PATCH 06/14] Moving conditional to load 'Microsoft.DotNet.Build.Tasks.Feed.targets' out of 'build.proj' --- build.proj | 2 +- build/publish/PublishNupkgToTransportFeed.targets | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build.proj b/build.proj index 3f755df09..bac606d59 100644 --- a/build.proj +++ b/build.proj @@ -52,7 +52,7 @@ - + diff --git a/build/publish/PublishNupkgToTransportFeed.targets b/build/publish/PublishNupkgToTransportFeed.targets index 939b02c01..053ee47af 100644 --- a/build/publish/PublishNupkgToTransportFeed.targets +++ b/build/publish/PublishNupkgToTransportFeed.targets @@ -1,7 +1,11 @@ - - + + "$(NuGetPackagesDir)/microsoft.dotnet.build.tasks.feed/$(BuildTasksFeedToolVersion)/build/Microsoft.DotNet.Build.Tasks.Feed.targets" + + + + From 31fd2312b0642183dc4a37bae92a306fbab37c67 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Thu, 9 Nov 2017 12:11:25 -0800 Subject: [PATCH 07/14] Make the "ExpectedFeedUrl" fully configurable. --- build/AzureInfo.props | 2 ++ build/publish/PublishNupkgToTransportFeed.targets | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build/AzureInfo.props b/build/AzureInfo.props index b651458ee..df686e43e 100644 --- a/build/AzureInfo.props +++ b/build/AzureInfo.props @@ -14,6 +14,8 @@ dotnetclichecksums $(TRANSPORTFEED_STORAGE_CONTAINER) dotnet-core + $(TRANSPORTFEED_EXPECTED_URL) + https://dotnetfeed.blob.core.windows.net/$(TransportFeedContainerName)/index.json $(TRANSPORTFEED_STORAGE_KEY) diff --git a/build/publish/PublishNupkgToTransportFeed.targets b/build/publish/PublishNupkgToTransportFeed.targets index 053ee47af..82fd2839d 100644 --- a/build/publish/PublishNupkgToTransportFeed.targets +++ b/build/publish/PublishNupkgToTransportFeed.targets @@ -4,7 +4,7 @@ "$(NuGetPackagesDir)/microsoft.dotnet.build.tasks.feed/$(BuildTasksFeedToolVersion)/build/Microsoft.DotNet.Build.Tasks.Feed.targets" - + @@ -12,12 +12,13 @@ - https://dotnetfeed.blob.core.windows.net/$(TransportFeedContainerName)/index.json + $(TransportFeedExpectedURL) - + + Date: Thu, 9 Nov 2017 12:14:56 -0800 Subject: [PATCH 08/14] Fixed an incorrect conditional. --- build/AzureInfo.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/AzureInfo.props b/build/AzureInfo.props index df686e43e..2773a817c 100644 --- a/build/AzureInfo.props +++ b/build/AzureInfo.props @@ -15,7 +15,7 @@ $(TRANSPORTFEED_STORAGE_CONTAINER) dotnet-core $(TRANSPORTFEED_EXPECTED_URL) - https://dotnetfeed.blob.core.windows.net/$(TransportFeedContainerName)/index.json + https://dotnetfeed.blob.core.windows.net/$(TransportFeedContainerName)/index.json $(TRANSPORTFEED_STORAGE_KEY) From ef22bb23fcd133af1e1d6a7a9f0cf8d0a3654e75 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Thu, 9 Nov 2017 12:17:25 -0800 Subject: [PATCH 09/14] Simplified some logic. --- build/publish/PublishNupkgToTransportFeed.targets | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/build/publish/PublishNupkgToTransportFeed.targets b/build/publish/PublishNupkgToTransportFeed.targets index 82fd2839d..c610edc2f 100644 --- a/build/publish/PublishNupkgToTransportFeed.targets +++ b/build/publish/PublishNupkgToTransportFeed.targets @@ -11,17 +11,13 @@ - - $(TransportFeedExpectedURL) - - From 85e79297c35f9a17c7d508cc595d50011cf0ea65 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Thu, 9 Nov 2017 13:38:33 -0800 Subject: [PATCH 10/14] Simplified logic; part 2. --- build/publish/PublishNupkgToTransportFeed.targets | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/build/publish/PublishNupkgToTransportFeed.targets b/build/publish/PublishNupkgToTransportFeed.targets index c610edc2f..19dd03e71 100644 --- a/build/publish/PublishNupkgToTransportFeed.targets +++ b/build/publish/PublishNupkgToTransportFeed.targets @@ -1,10 +1,6 @@ - - "$(NuGetPackagesDir)/microsoft.dotnet.build.tasks.feed/$(BuildTasksFeedToolVersion)/build/Microsoft.DotNet.Build.Tasks.Feed.targets" - - - + From 9599ee5b777caea023e506e74cda96fa2b01713c Mon Sep 17 00:00:00 2001 From: John Beisner Date: Sat, 11 Nov 2017 20:30:23 -0800 Subject: [PATCH 11/14] Removing the MyGet 'dotnet-core' from the Nuget.config --- NuGet.Config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.Config b/NuGet.Config index 95416b2f1..10ffdab23 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -5,7 +5,6 @@ - From 929cf1d5ac4576e90ec76e6b5c9656f8fd3637a9 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Sat, 11 Nov 2017 21:22:54 -0800 Subject: [PATCH 12/14] Corrected usage... --- run-build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-build.ps1 b/run-build.ps1 index d3bb1152b..17a46a335 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -16,7 +16,7 @@ param( if($Help) { - Write-Output "Usage: .\build.ps1 [-Configuration ] [-Architecture ] [-NoPackage] [-Help]" + Write-Output "Usage: .\run-build.ps1 [-Configuration ] [-Architecture ] [-NoPackage] [-Help]" Write-Output "" Write-Output "Options:" Write-Output " -Configuration Build the specified Configuration (Debug or Release, default: Debug)" From e212767253e4aaf89cb38627c923925078372396 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 14 Nov 2017 12:57:11 -0800 Subject: [PATCH 13/14] Keeping the branding suffix as servicing. --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index b8a2d499e..2f7ba1395 100644 --- a/build/Version.props +++ b/build/Version.props @@ -3,7 +3,7 @@ 2 0 3 - preview + servicing $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix) $(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount) From dad6eb275d29cab7e9798185c983e0df6eca63f4 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 14 Nov 2017 18:54:01 -0800 Subject: [PATCH 14/14] Adding the ASP.NET feed where the ASP.NET templates are being published to. --- NuGet.Config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.Config b/NuGet.Config index 95416b2f1..1b3a83551 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -18,5 +18,6 @@ +