From 61b0b83f757951d50e529def216130d59328bfff Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 21 Nov 2018 01:39:38 +0000 Subject: [PATCH 1/5] Updating submodule(s) Mvc => bfdecc8f5e06768d7aadb670db3bd2eda9ef15d1 [auto-updated: submodules] --- modules/Mvc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Mvc b/modules/Mvc index 1521f9298b..bfdecc8f5e 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 1521f9298bc44e70d0fc5f9bc0814e101bbcc479 +Subproject commit bfdecc8f5e06768d7aadb670db3bd2eda9ef15d1 From 0cbfa9ce6dd03829199977bf8855021580c3171d Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 20 Nov 2018 19:47:12 -0800 Subject: [PATCH 2/5] Update branding to 3.0.0-preview (#4171) Changes: * This uses date-based versioning * Builds are `3.0.0-preview-$(buildnumber)`, not alpha1 or preview1. --- build/AzureIntegration.targets | 3 +- build/CodeSign.targets | 4 +- build/RepositoryBuild.targets | 7 +-- build/repo.targets | 10 ++--- src/AzureIntegration/build/repo.targets | 4 +- src/AzureIntegration/version.props | 11 +---- src/Framework/Directory.Build.props | 2 +- src/IISIntegration/Directory.Build.props | 1 - src/IISIntegration/build/native.targets | 8 ++-- src/IISIntegration/build/repo.props | 2 + .../dependencies.overrides.props | 1 + src/IISIntegration/version.props | 16 +------ src/Installers/Debian/Runtime.debproj | 2 +- src/Installers/Windows/Wix.targets | 2 +- src/Installers/Windows/build.ps1 | 2 +- src/templating/version.props | 11 +---- version.props | 43 ++++++++++++++++--- 17 files changed, 66 insertions(+), 63 deletions(-) diff --git a/build/AzureIntegration.targets b/build/AzureIntegration.targets index 8df9536eb7..e58bcce854 100644 --- a/build/AzureIntegration.targets +++ b/build/AzureIntegration.targets @@ -10,7 +10,8 @@ RepositoryRoot=$(AzureIntegrationProjectRoot); DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath); DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath); - BuildNumber=$(BuildNumber); + VersionSuffix=$(VersionSuffix); + BuildNumberSuffix=$(BuildNumberSuffix); Configuration=$(Configuration); IsFinalBuild=$(IsFinalBuild); diff --git a/build/CodeSign.targets b/build/CodeSign.targets index ddc1e51d6e..dcbc68c5f2 100644 --- a/build/CodeSign.targets +++ b/build/CodeSign.targets @@ -36,14 +36,14 @@ diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets index 0c88f5afad..422f764372 100644 --- a/build/RepositoryBuild.targets +++ b/build/RepositoryBuild.targets @@ -31,7 +31,7 @@ BuildInParallel="true" StopOnFirstFailure="true" Targets="_BuildRepository" - Properties="BuildGroup=%(BatchedRepository.BuildGroup);BuildNumber=$(BuildNumber);IsFinalBuild=$(IsFinalBuild);Configuration=$(Configuration)" /> + Properties="BuildGroup=%(BatchedRepository.BuildGroup);VersionSuffix=$(VersionSuffix);BuildNumberSuffix=$(BuildNumberSuffix);IsFinalBuild=$(IsFinalBuild);Configuration=$(Configuration)" /> <_ReposWereBuilt>true @@ -54,7 +54,7 @@ BuildInParallel="$(TestProjectsInParallel)" StopOnFirstFailure="false" Targets="_TestRepository" - Properties="BuildNumber=$(BuildNumber);IsFinalBuild=$(IsFinalBuild);Configuration=$(Configuration);_NoBuildRepos=$(_NoBuildRepos)" + Properties="VersionSuffix=$(VersionSuffix);BuildNumberSuffix=$(BuildNumberSuffix);IsFinalBuild=$(IsFinalBuild);Configuration=$(Configuration);_NoBuildRepos=$(_NoBuildRepos)" ContinueOnError="true"> @@ -83,7 +83,8 @@ $(RepositoryBuildArguments) /p:DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath) $(RepositoryBuildArguments) /p:SignType= - $(RepositoryBuildArguments) /p:BuildNumber=$(BuildNumber) + $(RepositoryBuildArguments) /p:VersionSuffix=$(VersionSuffix) + $(RepositoryBuildArguments) /p:BuildNumberSuffix=$(BuildNumberSuffix) $(RepositoryBuildArguments) /p:Configuration=$(Configuration) $(RepositoryBuildArguments) /p:IsFinalBuild=$(IsFinalBuild) $(RepositoryBuildArguments) '/p:DotNetAssetRootAccessTokenSuffix=$(DotNetAssetRootAccessTokenSuffix)' diff --git a/build/repo.targets b/build/repo.targets index 93a372d4fc..50c2ef8ee3 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -87,14 +87,14 @@ @@ -102,7 +102,7 @@ @@ -116,14 +116,14 @@ --> diff --git a/src/AzureIntegration/build/repo.targets b/src/AzureIntegration/build/repo.targets index 199837a956..9dcc1240cc 100644 --- a/src/AzureIntegration/build/repo.targets +++ b/src/AzureIntegration/build/repo.targets @@ -49,11 +49,11 @@ + Properties="VersionSuffix=$(VersionSuffix);BuildNumberSuffix=$(BuildNumberSuffix)" /> + Properties="%(SiteExtensions.BuildProperties);DotnetHomeDirectory=$(SiteExtensionWorkingDirectory);VersionSuffix=$(VersionSuffix);BuildNumberSuffix=$(BuildNumberSuffix);PackageOutputPath=$(SiteExtensionOutputDirectory)" /> diff --git a/src/AzureIntegration/version.props b/src/AzureIntegration/version.props index bcf920cf80..39e69414a0 100644 --- a/src/AzureIntegration/version.props +++ b/src/AzureIntegration/version.props @@ -1,12 +1,3 @@ - - 3.0.0 - alpha1 - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - t000 - a- - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(VersionSuffix)-$(BuildNumber) - + diff --git a/src/Framework/Directory.Build.props b/src/Framework/Directory.Build.props index eb1297900f..27f7138ba4 100644 --- a/src/Framework/Directory.Build.props +++ b/src/Framework/Directory.Build.props @@ -7,7 +7,7 @@ diff --git a/src/IISIntegration/Directory.Build.props b/src/IISIntegration/Directory.Build.props index 9b394c5bd7..0a9fa7039c 100644 --- a/src/IISIntegration/Directory.Build.props +++ b/src/IISIntegration/Directory.Build.props @@ -2,7 +2,6 @@ - diff --git a/src/IISIntegration/build/native.targets b/src/IISIntegration/build/native.targets index 1c5a981691..1fb3869566 100644 --- a/src/IISIntegration/build/native.targets +++ b/src/IISIntegration/build/native.targets @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/src/IISIntegration/build/repo.props b/src/IISIntegration/build/repo.props index 44da1e6bcb..181d77ddf0 100644 --- a/src/IISIntegration/build/repo.props +++ b/src/IISIntegration/build/repo.props @@ -5,6 +5,8 @@ true + 2.0.0 + $(BuildDir)StressTestWebSite.zip diff --git a/src/IISIntegration/dependencies.overrides.props b/src/IISIntegration/dependencies.overrides.props index 9c1a843f93..189af4b593 100644 --- a/src/IISIntegration/dependencies.overrides.props +++ b/src/IISIntegration/dependencies.overrides.props @@ -4,6 +4,7 @@ + 2.0.0 2.2.0-preview3-35497 2.2.0-preview3-35497 diff --git a/src/IISIntegration/version.props b/src/IISIntegration/version.props index 97afbbb038..235b1bbb34 100644 --- a/src/IISIntegration/version.props +++ b/src/IISIntegration/version.props @@ -1,17 +1,3 @@  - - 3 - 0 - 0 - alpha1 - $([System.DateTime]::Now.ToString('yyMMdd'))-99 - $(DotNetMajorVersion).$(DotNetMinorVersion).$(DotNetPatchVersion) - 13 - $(DotNetMinorVersion) - $(DotNetPatchVersion) - $(VersionPrefix) - $(VersionPrefix)-$(PreReleaseLabel)-$(BuildNumber) - $(PackageVersion) - 2.0.0 - + diff --git a/src/Installers/Debian/Runtime.debproj b/src/Installers/Debian/Runtime.debproj index ffe02b315e..7895bcd645 100644 --- a/src/Installers/Debian/Runtime.debproj +++ b/src/Installers/Debian/Runtime.debproj @@ -31,7 +31,7 @@ $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) - $(PackageVersion)~$(PreReleaseLabel)-$(BuildNumber) + $(PackageVersion)~$(PreReleaseLabel)-$(BuildNumberSuffix) 1 diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index 85eecfa243..8abf268608 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -7,7 +7,7 @@ $(Version);$(Platform) - $(GuidInputs);$(BuildNumber) + $(GuidInputs);$(BuildNumberSuffix) diff --git a/src/Installers/Windows/build.ps1 b/src/Installers/Windows/build.ps1 index 287bcdb243..a3629b2683 100644 --- a/src/Installers/Windows/build.ps1 +++ b/src/Installers/Windows/build.ps1 @@ -67,7 +67,7 @@ try { -clp:Summary ` "-p:SharedFrameworkHarvestRootPath=$repoRoot/obj/sfx/" ` "-p:Configuration=$Configuration" ` - "-p:BuildNumber=$BuildNumber" ` + "-p:BuildNumberSuffix=$BuildNumber" ` "-p:SignType=$SignType" ` "-p:IsFinalBuild=$IsFinalBuild" ` "-bl:$repoRoot/artifacts/logs/installers.msbuild.binlog" ` diff --git a/src/templating/version.props b/src/templating/version.props index 2aae215c04..235b1bbb34 100644 --- a/src/templating/version.props +++ b/src/templating/version.props @@ -1,12 +1,3 @@  - - 3.0.0 - alpha1 - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - t000 - a- - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(VersionSuffix)-$(BuildNumber) - + diff --git a/version.props b/version.props index c3848a6cbd..0c1a867e07 100644 --- a/version.props +++ b/version.props @@ -3,13 +3,44 @@ 3 0 0 - alpha1 - Alpha 1 - $([System.DateTime]::Now.ToString('yyMMdd'))-99 - $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) + preview + Preview 0.3.$(AspNetCorePatchVersion) - $(PreReleaseLabel)-$(BuildNumber) - $(PreReleaseBrandingLabel) Build $(BuildNumber) + + 1$(AspNetCoreMajorVersion) + + $(BUILD_BUILDNUMBER) + $([System.DateTime]::Now.ToString('yyyyMMdd')).$(BUILD_NUMBER) + + + + + <_BuildNumber>$(OfficialBuildId) + + + <_BuildNumberYY>$(_BuildNumber.Substring(2, 2)) + <_BuildNumberMM>$(_BuildNumber.Substring(4, 2)) + <_BuildNumberDD>$(_BuildNumber.Substring(6, 2)) + <_BuildNumberR>$(_BuildNumber.Substring(9)) + + + <_BuildNumberShortDate>$([MSBuild]::Add($([MSBuild]::Add($([MSBuild]::Multiply($(_BuildNumberYY), 1000)), $([MSBuild]::Multiply($(_BuildNumberMM), 50)))), $(_BuildNumberDD))) + + $([System.Convert]::ToInt32($(_BuildNumberR))) + + + $(VersionSuffixBuildOfTheDay.PadLeft(2, '0')) + $(VersionSuffixBuildOfTheDay.PadLeft(4, '0')) + + + $(_BuildNumberShortDate)-$(VersionSuffixBuildOfTheDayPadded) + + + + 0 + $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) + $(PreReleaseLabel)-$(BuildNumberSuffix) + $(PreReleaseBrandingLabel) Build $(BuildNumberSuffix) true From ccb335799f55b437fe8a5c6f04560ce2643222b7 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 20 Nov 2018 21:15:09 -0800 Subject: [PATCH 3/5] Updating BuildTools from 3.0.0-build-20181120.3 to 3.0.0-build-20181120.4 [auto-updated: buildtools] --- global.json | 2 +- korebuild-lock.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/global.json b/global.json index f5d98dad5f..bdcca8e1ad 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "version": "3.0.100-preview-009750" }, "msbuild-sdks": { - "Internal.AspNetCore.Sdk": "3.0.0-build-20181120.3" + "Internal.AspNetCore.Sdk": "3.0.0-build-20181120.4" } } diff --git a/korebuild-lock.txt b/korebuild-lock.txt index db29c1073c..0970da4378 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-build-20181120.3 -commithash:9de81a1b21ae00a292f6b5fb660857b75bb4ff74 +version:3.0.0-build-20181120.4 +commithash:84dcc6f0eb5455a3c0305d6d238926defb050889 From e25c2acb257d279ba87c3f6fce9539018f1a3f8f Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 21 Nov 2018 08:35:25 -0800 Subject: [PATCH 4/5] Flow BUILD_NUMBER and BUILD_BUILDNUMBER into Docker builds --- dockerbuild.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dockerbuild.sh b/dockerbuild.sh index db6dbbaa15..b34962846e 100755 --- a/dockerbuild.sh +++ b/dockerbuild.sh @@ -108,6 +108,8 @@ docker run \ -t \ -e CI \ -e TEAMCITY_VERSION \ + -e BUILD_NUMBER \ + -e BUILD_BUILDNUMBER \ -e DOTNET_CLI_TELEMETRY_OPTOUT \ -e Configuration \ -v "$DIR:/code/build" \ From 40ef11cf54fa65f9e79d630b1f187ae3f8961f4d Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 21 Nov 2018 09:12:06 -0800 Subject: [PATCH 5/5] Fix UserSecretsIdAttribute generation when using FrameworkReference to Microsoft.AspNetCore.App (#4177) When only Microsoft.AspNetCore.App is referenced, the project will no longer have MSBuild imports from the Microsoft.Extensions.Configuration.UserSecrets package, which takes care of generating the UserSecretsIdAttribute. This ensures the attribute is still generated in default project templates without needing a new package ref to Config.UserSecrets. --- .../pkg/Microsoft.AspNetCore.App.targets | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/Framework/pkg/Microsoft.AspNetCore.App.targets b/src/Framework/pkg/Microsoft.AspNetCore.App.targets index 9e85ffd055..be73b09622 100644 --- a/src/Framework/pkg/Microsoft.AspNetCore.App.targets +++ b/src/Framework/pkg/Microsoft.AspNetCore.App.targets @@ -4,4 +4,27 @@ Text="This version of Microsoft.AspNetCore.App is only compatible with the netcoreapp3.0 target framework. Please target netcoreapp3.0 or choose a version of Microsoft.AspNetCore.App compatible with $(TargetFramework)." Condition="'$(TargetFramework)' != 'netcoreapp3.0'"/> + + + + + + + + <_Parameter1>$(UserSecretsId.Trim()) + + +