From e66b37f5788e3af4e3bccd86d5e9c16bb420ea3d Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 15 May 2019 16:15:38 -0700 Subject: [PATCH 1/6] Update versioning for local and PR builds to match Arcade versioning --- .../Microsoft.VisualStudio.BlazorExtension.csproj | 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 +- .../clients/ts/signalr-protocol-msgpack/package.json | 2 +- src/SignalR/clients/ts/signalr/package.json | 2 +- version.props | 12 +++++++----- 10 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj b/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj index d79ec9bc6387..3ade16c4dd27 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/ProjectTemplates/scripts/Run-Angular-Locally.ps1 b/src/ProjectTemplates/scripts/Run-Angular-Locally.ps1 index f431d40f3629..cdcdd12db768 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 fc06d652945a..b5684535cce1 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 9fc7667cbfcc..72f84ad9cc85 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 0be4d48aab42..524a423a9968 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 5bec0dccc58b..088c8a803e52 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 f2e095a3f588..c7adbbbf24a6 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/SignalR/clients/ts/signalr-protocol-msgpack/package.json b/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json index 04101c7effa9..00b01bbd9a6c 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 aea8c0918b7f..4a73f1549ad0 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 d48d4c2aa5d6..8a53be49d889 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) From 724447b623db82bb831df647b22d3a71ea5bffd7 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 16 May 2019 08:07:25 -0700 Subject: [PATCH 2/6] Mark CanCancelIAsyncEnumerableClientToServerUpload as flaky - cref aspnet/AspNetCore-Internal#2465 --- .../csharp/Client/test/FunctionalTests/HubConnectionTests.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs b/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs index 0ce0c0bbe86d..5a8d26f060f1 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.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 @@ async IAsyncEnumerable clientStreamData() } [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) From df5bb6cfa6dec52c0f84860818ba1efa334b02eb Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 16 May 2019 08:10:54 -0700 Subject: [PATCH 3/6] Fix installers build --- src/Installers/Windows/Wix.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/Wix.props b/src/Installers/Windows/Wix.props index 837ed106f60a..217c384d3a86 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 From ddf78f6cafe6539240d63bfb63b50557af988a73 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 16 May 2019 09:12:55 -0700 Subject: [PATCH 4/6] WIP --- docs/BuildFromSource.md | 2 +- src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/BuildFromSource.md b/docs/BuildFromSource.md index 0839d8d9c346..3994cf4bf1d5 100644 --- a/docs/BuildFromSource.md +++ b/docs/BuildFromSource.md @@ -202,7 +202,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/ProjectTemplates/test/Infrastructure/TemplateTests.props.in b/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in index 807101c20e6b..fa2866b7b6e4 100644 --- a/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in +++ b/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in @@ -19,7 +19,7 @@ LatestRuntimeFrameworkVersion="${MicrosoftAspNetCoreAppPackageVersion}" TargetingPackName="Microsoft.AspNetCore.App.Ref" TargetingPackVersion="${MicrosoftAspNetCoreAppPackageVersion}" - RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**" + RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**" RuntimePackRuntimeIdentifiers="${SupportedRuntimeIdentifiers}" /> From 8ea1f0a39d147cc3b1b1a18058eb959c528a1faa Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 16 May 2019 10:42:45 -0700 Subject: [PATCH 5/6] Disable rollforward in project template tests --- .../test/Infrastructure/TemplateTests.props.in | 2 ++ .../test/Infrastructure/runtimeconfig.norollforward.json | 3 +++ src/ProjectTemplates/test/ProjectTemplates.Tests.csproj | 2 ++ 3 files changed, 7 insertions(+) create mode 100644 src/ProjectTemplates/test/Infrastructure/runtimeconfig.norollforward.json diff --git a/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in b/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in index fa2866b7b6e4..d6caf0e26ba5 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} diff --git a/src/ProjectTemplates/test/Infrastructure/runtimeconfig.norollforward.json b/src/ProjectTemplates/test/Infrastructure/runtimeconfig.norollforward.json new file mode 100644 index 000000000000..96587d23f28d --- /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 d1b1ffe43f0e..38f4cd2803c2 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -126,6 +126,8 @@ Properties="" OutputPath="$(TestTemplateCreationFolder)Directory.Build.props" /> + + From 77a4c713a8bf1f47da32e5401a2656b69241dcf8 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 16 May 2019 11:25:49 -0700 Subject: [PATCH 6/6] Update ProjectTemplates.Tests.csproj --- src/ProjectTemplates/test/ProjectTemplates.Tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index 38f4cd2803c2..d15066f3907f 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -126,6 +126,7 @@ Properties="" OutputPath="$(TestTemplateCreationFolder)Directory.Build.props" /> +