From 117dd8cff4231c1567938d9835a22ff9c525a9ae Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 16 May 2019 12:59:40 -0700 Subject: [PATCH] Use Arcade version suffixes for local (3.0.0-dev) and PR builds (3.0.0-ci) (#10279) * Update versioning for local and PR builds to match Arcade versioning * Mark CanCancelIAsyncEnumerableClientToServerUpload as flaky - cref aspnet/AspNetCore-Internal#2465 * Disable rollforward in project template tests (3.0.0-dev is older than 3.0.0-preview*). This prevents tests from rolling forward onto technically older bits --- docs/BuildFromSource.md | 2 +- .../Microsoft.VisualStudio.BlazorExtension.csproj | 2 +- src/Installers/Windows/Wix.props | 2 +- src/ProjectTemplates/scripts/Run-Angular-Locally.ps1 | 2 +- .../scripts/Run-EmptyWeb-Locally.ps1 | 2 +- src/ProjectTemplates/scripts/Run-Razor-Locally.ps1 | 2 +- src/ProjectTemplates/scripts/Run-React-Locally.ps1 | 2 +- .../scripts/Run-ReactRedux-Locally.ps1 | 2 +- .../scripts/Run-Starterweb-Locally.ps1 | 2 +- .../test/Infrastructure/TemplateTests.props.in | 4 +++- .../Infrastructure/runtimeconfig.norollforward.json | 3 +++ .../test/ProjectTemplates.Tests.csproj | 3 +++ .../test/FunctionalTests/HubConnectionTests.cs | 2 ++ .../clients/ts/signalr-protocol-msgpack/package.json | 2 +- src/SignalR/clients/ts/signalr/package.json | 2 +- version.props | 12 +++++++----- 16 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 src/ProjectTemplates/test/Infrastructure/runtimeconfig.norollforward.json diff --git a/docs/BuildFromSource.md b/docs/BuildFromSource.md index 16ab546892..0524cd80f9 100644 --- a/docs/BuildFromSource.md +++ b/docs/BuildFromSource.md @@ -204,7 +204,7 @@ See ["Artifacts"](./Artifacts.md) for more explanation of the different folders - Update the versions on `PackageReference` items in your .csproj project file to point to the version from your local build. ```xml - + ``` diff --git a/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj b/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj index d79ec9bc63..3ade16c4dd 100644 --- a/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj +++ b/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj @@ -48,7 +48,7 @@ is used by our build system. --> 16.0 - 424242.424242 + 424242.424242 $(BuildNumberSuffix.Replace('-', '.')) $(VsixVersionPrefix).$(VsixVersionSuffix) diff --git a/src/Installers/Windows/Wix.props b/src/Installers/Windows/Wix.props index 837ed106f6..217c384d3a 100644 --- a/src/Installers/Windows/Wix.props +++ b/src/Installers/Windows/Wix.props @@ -4,7 +4,7 @@ $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion).0 - $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion).$(_BuildNumberShortDate) + $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion).$(FileRevisionVersion) Release x64 ENU diff --git a/src/ProjectTemplates/scripts/Run-Angular-Locally.ps1 b/src/ProjectTemplates/scripts/Run-Angular-Locally.ps1 index f431d40f36..cdcdd12db7 100644 --- a/src/ProjectTemplates/scripts/Run-Angular-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-Angular-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "angular" "angular" "Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0.0-preview5-t000.nupkg" $true +Test-Template "angular" "angular" "Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0.0-dev.nupkg" $true diff --git a/src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1 b/src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1 index fc06d65294..b5684535cc 100644 --- a/src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "web" "web" "Microsoft.DotNet.Web.ProjectTemplates.3.0.3.0.0-preview4-t000.nupkg" $false +Test-Template "web" "web" "Microsoft.DotNet.Web.ProjectTemplates.3.0.3.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-Razor-Locally.ps1 b/src/ProjectTemplates/scripts/Run-Razor-Locally.ps1 index 9fc7667cbf..72f84ad9cc 100644 --- a/src/ProjectTemplates/scripts/Run-Razor-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-Razor-Locally.ps1 @@ -6,4 +6,4 @@ param() . $PSScriptRoot\Test-Template.ps1 -Test-Template "webapp" "webapp -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.3.0.3.0.0-preview4-t000.nupkg" $false +Test-Template "webapp" "webapp -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.3.0.3.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-React-Locally.ps1 b/src/ProjectTemplates/scripts/Run-React-Locally.ps1 index 0be4d48aab..524a423a99 100644 --- a/src/ProjectTemplates/scripts/Run-React-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-React-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "react" "react" "Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0.0-preview4-t000.nupkg" $true +Test-Template "react" "react" "Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0.0-dev.nupkg" $true diff --git a/src/ProjectTemplates/scripts/Run-ReactRedux-Locally.ps1 b/src/ProjectTemplates/scripts/Run-ReactRedux-Locally.ps1 index 5bec0dccc5..088c8a803e 100644 --- a/src/ProjectTemplates/scripts/Run-ReactRedux-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-ReactRedux-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "reactredux" "reactredux" "Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0.0-preview4-t000.nupkg" $true +Test-Template "reactredux" "reactredux" "Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0.0-dev.nupkg" $true diff --git a/src/ProjectTemplates/scripts/Run-Starterweb-Locally.ps1 b/src/ProjectTemplates/scripts/Run-Starterweb-Locally.ps1 index f2e095a3f5..c7adbbbf24 100644 --- a/src/ProjectTemplates/scripts/Run-Starterweb-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-Starterweb-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "mvc" "mvc -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.3.0.3.0.0-preview4-t000.nupkg" $false +Test-Template "mvc" "mvc -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.3.0.3.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in b/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in index 807101c20e..d6caf0e26b 100644 --- a/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in +++ b/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in @@ -2,6 +2,8 @@ true ${RestoreSources} + + $(MSBuildThisFileDirectory)runtimeconfig.norollforward.json ${MicrosoftNETCorePlatformsPackageVersion} @@ -19,7 +21,7 @@ LatestRuntimeFrameworkVersion="${MicrosoftAspNetCoreAppPackageVersion}" TargetingPackName="Microsoft.AspNetCore.App.Ref" TargetingPackVersion="${MicrosoftAspNetCoreAppPackageVersion}" - RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**" + RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**" RuntimePackRuntimeIdentifiers="${SupportedRuntimeIdentifiers}" /> diff --git a/src/ProjectTemplates/test/Infrastructure/runtimeconfig.norollforward.json b/src/ProjectTemplates/test/Infrastructure/runtimeconfig.norollforward.json new file mode 100644 index 0000000000..96587d23f2 --- /dev/null +++ b/src/ProjectTemplates/test/Infrastructure/runtimeconfig.norollforward.json @@ -0,0 +1,3 @@ +{ + "rollForward": "Disable" +} diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index d1b1ffe43f..d15066f390 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -126,6 +126,9 @@ Properties="" OutputPath="$(TestTemplateCreationFolder)Directory.Build.props" /> + + + diff --git a/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs b/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs index 0ce0c0bbe8..5a8d26f060 100644 --- a/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs +++ b/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs @@ -13,6 +13,7 @@ using Microsoft.AspNetCore.Http.Connections; using Microsoft.AspNetCore.Http.Connections.Client; using Microsoft.AspNetCore.SignalR.Protocol; using Microsoft.AspNetCore.SignalR.Tests; +using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -769,6 +770,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests } [Theory] + [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2465", FlakyOn.All)] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] [LogLevel(LogLevel.Trace)] public async Task CanCancelIAsyncEnumerableClientToServerUpload(string protocolName, HttpTransportType transportType, string path) diff --git a/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json b/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json index 04101c7eff..00b01bbd9a 100644 --- a/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json +++ b/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json @@ -1,6 +1,6 @@ { "name": "@aspnet/signalr-protocol-msgpack", - "version": "3.0.0-preview4-t000", + "version": "3.0.0-dev", "description": "MsgPack Protocol support for ASP.NET Core SignalR", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", diff --git a/src/SignalR/clients/ts/signalr/package.json b/src/SignalR/clients/ts/signalr/package.json index aea8c0918b..4a73f1549a 100644 --- a/src/SignalR/clients/ts/signalr/package.json +++ b/src/SignalR/clients/ts/signalr/package.json @@ -1,6 +1,6 @@ { "name": "@aspnet/signalr", - "version": "3.0.0-preview4-t000", + "version": "3.0.0-dev", "description": "ASP.NET Core SignalR Client", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", diff --git a/version.props b/version.props index d48d4c2aa5..8a53be49d8 100644 --- a/version.props +++ b/version.props @@ -17,10 +17,10 @@ $(AspNetCorePatchVersion) $(BUILD_BUILDNUMBER) - $([System.DateTime]::Now.ToString('yyyyMMdd')).1 + true - + <_BuildNumber>$(OfficialBuildId) @@ -40,15 +40,17 @@ $(_BuildNumberShortDate)-$(VersionSuffixBuildOfTheDayPadded) $(_BuildNumberShortDate) + $(PreReleaseLabel)-$(BuildNumberSuffix) - - t000 + + 0 42424 + dev + ci - $(PreReleaseLabel)-$(BuildNumberSuffix) $(PreReleaseBrandingLabel) Build $(BuildNumberSuffix)