From e283d0be151cff29ba2498d930f8b4bae849dc9d Mon Sep 17 00:00:00 2001 From: Javier Calvarro Nelson Date: Wed, 25 Sep 2019 18:11:35 +0200 Subject: [PATCH 1/8] Capture process dumps for child dotnet processes (#1170) --- .../IntegrationTests/MSBuildProcessManager.cs | 74 +++++++++++++++---- 1 file changed, 60 insertions(+), 14 deletions(-) diff --git a/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/MSBuildProcessManager.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/MSBuildProcessManager.cs index 97000aa280f..d5d9ee61de0 100644 --- a/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/MSBuildProcessManager.cs +++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/MSBuildProcessManager.cs @@ -76,6 +76,9 @@ internal static Task RunProcessCoreAsync( var output = new StringBuilder(); var outputLock = new object(); + var diagnostics = new StringBuilder(); + diagnostics.AppendLine("Process execution diagnostics:"); + process.ErrorDataReceived += Process_ErrorDataReceived; process.OutputDataReceived += Process_OutputDataReceived; @@ -83,7 +86,7 @@ internal static Task RunProcessCoreAsync( process.BeginOutputReadLine(); process.BeginErrorReadLine(); - var timeoutTask = GetTimeoutForProcess(process, timeout); + var timeoutTask = GetTimeoutForProcess(process, timeout, diagnostics); var waitTask = Task.Run(() => { @@ -100,10 +103,19 @@ internal static Task RunProcessCoreAsync( process.WaitForExit(); + string outputString; lock (outputLock) { - outputString = output.ToString(); + // This marks the end of the diagnostic info which we collect when something goes wrong. + diagnostics.AppendLine("Process output:"); + + // Expected output + // Process execution diagnostics: + // ... + // Process output: + outputString = diagnostics.ToString(); + outputString += output.ToString(); } var result = new ProcessResult(process.StartInfo.FileName, process.StartInfo.Arguments, process.ExitCode, outputString); @@ -128,7 +140,7 @@ void Process_OutputDataReceived(object sender, DataReceivedEventArgs e) } } - async Task GetTimeoutForProcess(Process process, TimeSpan? timeout) + async Task GetTimeoutForProcess(Process process, TimeSpan? timeout, StringBuilder diagnostics) { await Task.Delay(timeout.Value); @@ -139,12 +151,7 @@ async Task GetTimeoutForProcess(Process process, TimeSpan? timeou } if (!process.HasExited) { - var procDumpProcess = await CaptureDump(process); - if (procDumpProcess != null && procDumpProcess.HasExited) - { - Console.WriteLine("ProcDump failed to run."); - procDumpProcess.Kill(); - } + await CollectDumps(process, timeout, diagnostics); // This is a timeout. process.Kill(); @@ -153,7 +160,46 @@ async Task GetTimeoutForProcess(Process process, TimeSpan? timeou throw new TimeoutException($"command '${process.StartInfo.FileName} {process.StartInfo.Arguments}' timed out after {timeout}. Output: {output.ToString()}"); } - async Task CaptureDump(Process process) + static async Task CollectDumps(Process process, TimeSpan? timeout, StringBuilder diagnostics) + { + var procDumpProcess = await CaptureDump(process, timeout, diagnostics); + var allDotNetProcesses = Process.GetProcessesByName("dotnet"); + + var allDotNetChildProcessCandidates = allDotNetProcesses + .Where(p => p.StartTime >= process.StartTime && p.Id != process.Id); + + if (!allDotNetChildProcessCandidates.Any()) + { + diagnostics.AppendLine("Couldn't find any candidate child process."); + foreach (var dotnetProcess in allDotNetProcesses) + { + diagnostics.AppendLine($"Found dotnet process with PID {dotnetProcess.Id} and start time {dotnetProcess.StartTime}."); + } + } + + foreach (var childProcess in allDotNetChildProcessCandidates) + { + diagnostics.AppendLine($"Found child process candidate '{childProcess.Id}'."); + } + + var childrenProcessDumpProcesses = await Task.WhenAll(allDotNetChildProcessCandidates.Select(d => CaptureDump(d, timeout, diagnostics))); + foreach (var childProcess in childrenProcessDumpProcesses) + { + if (childProcess != null && childProcess.HasExited) + { + diagnostics.AppendLine($"ProcDump failed to run for child dotnet process candidate '{process.Id}'."); + childProcess.Kill(); + } + } + + if (procDumpProcess != null && procDumpProcess.HasExited) + { + diagnostics.AppendLine($"ProcDump failed to run for '{process.Id}'."); + procDumpProcess.Kill(); + } + } + + static async Task CaptureDump(Process process, TimeSpan? timeout, StringBuilder diagnostics) { var metadataAttributes = Assembly.GetExecutingAssembly() .GetCustomAttributes(); @@ -163,13 +209,13 @@ async Task CaptureDump(Process process) if (string.IsNullOrEmpty(procDumpPath)) { - Console.WriteLine("ProcDumpPath not defined."); + diagnostics.AppendLine("ProcDumpPath not defined."); return null; } var procDumpExePath = Path.Combine(procDumpPath, "procdump.exe"); if (!File.Exists(procDumpExePath)) { - Console.WriteLine($"Can't find procdump.exe in '{procDumpPath}'."); + diagnostics.AppendLine($"Can't find procdump.exe in '{procDumpPath}'."); return null; } @@ -178,13 +224,13 @@ async Task CaptureDump(Process process) if (string.IsNullOrEmpty(dumpDirectory)) { - Console.WriteLine("ArtifactsLogDir not defined."); + diagnostics.AppendLine("ArtifactsLogDir not defined."); return null; } if (!Directory.Exists(dumpDirectory)) { - Console.WriteLine($"'{dumpDirectory}' does not exist."); + diagnostics.AppendLine($"'{dumpDirectory}' does not exist."); return null; } From bd71bcf87b1c9a9401454c2df9ebed1f8157f91e Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Wed, 25 Sep 2019 10:50:13 -0700 Subject: [PATCH 2/8] Remove 1.x tests (#1169) --- .../tests/Completions1_0.test.ts | 49 -------- .../tests/TestUtil.ts | 1 - .../BuildIntegrationTest11.cs | 58 ---------- .../RestoreTestProjects.csproj | 2 - .../test/testapps/SimpleMvc11/Program.cs | 13 --- .../testapps/SimpleMvc11/SimpleMvc11.csproj | 23 ---- .../SimpleMvc11/Views/Home/Index.cshtml | 108 ------------------ .../SimpleMvc11/Views/Shared/_Layout.cshtml | 71 ------------ .../SimpleMvc11/Views/_ViewImports.cshtml | 3 - .../SimpleMvc11/Views/_ViewStart.cshtml | 3 - .../test/testapps/SimpleMvc11NetFx/Program.cs | 13 --- .../SimpleMvc11NetFx/SimpleMvc11NetFx.csproj | 19 --- .../SimpleMvc11NetFx/Views/Home/Index.cshtml | 108 ------------------ .../Views/Shared/_Layout.cshtml | 71 ------------ .../Views/_ViewImports.cshtml | 2 - .../SimpleMvc11NetFx/Views/_ViewStart.cshtml | 3 - 16 files changed, 547 deletions(-) delete mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.FunctionalTest/tests/Completions1_0.test.ts delete mode 100644 src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildIntegrationTest11.cs delete mode 100644 src/Razor/test/testapps/SimpleMvc11/Program.cs delete mode 100644 src/Razor/test/testapps/SimpleMvc11/SimpleMvc11.csproj delete mode 100644 src/Razor/test/testapps/SimpleMvc11/Views/Home/Index.cshtml delete mode 100644 src/Razor/test/testapps/SimpleMvc11/Views/Shared/_Layout.cshtml delete mode 100644 src/Razor/test/testapps/SimpleMvc11/Views/_ViewImports.cshtml delete mode 100644 src/Razor/test/testapps/SimpleMvc11/Views/_ViewStart.cshtml delete mode 100644 src/Razor/test/testapps/SimpleMvc11NetFx/Program.cs delete mode 100644 src/Razor/test/testapps/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj delete mode 100644 src/Razor/test/testapps/SimpleMvc11NetFx/Views/Home/Index.cshtml delete mode 100644 src/Razor/test/testapps/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml delete mode 100644 src/Razor/test/testapps/SimpleMvc11NetFx/Views/_ViewImports.cshtml delete mode 100644 src/Razor/test/testapps/SimpleMvc11NetFx/Views/_ViewStart.cshtml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.FunctionalTest/tests/Completions1_0.test.ts b/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.FunctionalTest/tests/Completions1_0.test.ts deleted file mode 100644 index 9e66549c281..00000000000 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.FunctionalTest/tests/Completions1_0.test.ts +++ /dev/null @@ -1,49 +0,0 @@ -/* -------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - * ------------------------------------------------------------------------------------------ */ - -import * as assert from 'assert'; -import { afterEach, before, beforeEach } from 'mocha'; -import * as path from 'path'; -import * as vscode from 'vscode'; -import { - pollUntil, - simpleMvc11Root, - waitForProjectReady, -} from './TestUtil'; - -let doc: vscode.TextDocument; -let editor: vscode.TextEditor; - -suite('Completions 1.0', () => { - before(async () => { - await waitForProjectReady(simpleMvc11Root); - }); - - beforeEach(async () => { - const filePath = path.join(simpleMvc11Root, 'Views', 'Home', 'Index.cshtml'); - doc = await vscode.workspace.openTextDocument(filePath); - editor = await vscode.window.showTextDocument(doc); - }); - - afterEach(async () => { - await vscode.commands.executeCommand('workbench.action.revertAndCloseActiveEditor'); - await pollUntil(() => vscode.window.visibleTextEditors.length === 0, 1000); - }); - - test('Can complete Razor directive', async () => { - const firstLine = new vscode.Position(0, 0); - await editor.edit(edit => edit.insert(firstLine, '@\n')); - const completions = await vscode.commands.executeCommand( - 'vscode.executeCompletionItemProvider', - doc.uri, - new vscode.Position(0, 1)); - - const hasCompletion = (text: string) => completions!.items.some(item => item.insertText === text); - - assert.ok(!hasCompletion('page'), 'Should not have completion for "page"'); - assert.ok(hasCompletion('inject'), 'Should have completion for "inject"'); - assert.ok(!hasCompletion('div'), 'Should not have completion for "div"'); - }); -}); diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.FunctionalTest/tests/TestUtil.ts b/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.FunctionalTest/tests/TestUtil.ts index ca6a5a6be9c..d55e21387c9 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.FunctionalTest/tests/TestUtil.ts +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.FunctionalTest/tests/TestUtil.ts @@ -13,7 +13,6 @@ export const razorRoot = path.join(__dirname, '..', '..', '..'); export const testAppsRoot = path.join(razorRoot, 'test', 'testapps'); export const mvcWithComponentsRoot = path.join(testAppsRoot, 'MvcWithComponents'); export const simpleMvc21Root = path.join(testAppsRoot, 'SimpleMvc21'); -export const simpleMvc11Root = path.join(testAppsRoot, 'SimpleMvc11'); export async function pollUntil(fn: () => boolean, timeoutMs: number, pollInterval?: number) { const resolvedPollInterval = pollInterval ? pollInterval : 50; diff --git a/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildIntegrationTest11.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildIntegrationTest11.cs deleted file mode 100644 index dc7d470a3c7..00000000000 --- a/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildIntegrationTest11.cs +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; -using Microsoft.AspNetCore.Testing; -using Xunit; - -namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests -{ - public class BuildIntegrationTest11 : MSBuildIntegrationTestBase, IClassFixture - { - public BuildIntegrationTest11(BuildServerTestFixture buildServer) - : base(buildServer) - { - } - - [Fact] - [InitializeTestProject("SimpleMvc11")] - public async Task RazorSdk_DoesNotAddCoreRazorConfigurationTo11Projects() - { - var result = await DotnetMSBuild("_IntrospectProjectCapabilityItems"); - - Assert.BuildPassed(result); - Assert.BuildOutputContainsLine(result, "ProjectCapability: DotNetCoreRazor"); - Assert.BuildOutputDoesNotContainLine(result, "ProjectCapability: DotNetCoreRazorConfiguration"); - } - - [Fact (Skip = "https://github.com/aspnet/AspNetCore-Tooling/pull/1122#issuecomment-530976125")] - [InitializeTestProject("SimpleMvc11")] - public async Task RazorSdk_DoesNotBuildViewsForNetCoreApp11Projects() - { - MSBuildIntegrationTestBase.TargetFramework = "netcoreapp1.1"; - var result = await DotnetMSBuild("Build"); - - Assert.BuildPassed(result); - Assert.FileExists(result, OutputPath, "SimpleMvc11.dll"); - Assert.FileExists(result, OutputPath, "SimpleMvc11.pdb"); - Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11.Views.dll"); - Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11.Views.pdb"); - } - - [ConditionalFact] - [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - - [InitializeTestProject("SimpleMvc11NetFx")] - public async Task RazorSdk_DoesNotBuildViewsForNetFx11Projects() - { - MSBuildIntegrationTestBase.TargetFramework = "net461"; - var result = await DotnetMSBuild("Build"); - - Assert.BuildPassed(result); - Assert.FileExists(result, OutputPath, "SimpleMvc11NetFx.exe"); - Assert.FileExists(result, OutputPath, "SimpleMvc11NetFx.pdb"); - Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11NetFx.Views.dll"); - Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11NetFx.Views.pdb"); - } - } -} diff --git a/src/Razor/test/testapps/RestoreTestProjects/RestoreTestProjects.csproj b/src/Razor/test/testapps/RestoreTestProjects/RestoreTestProjects.csproj index ced12b1fa38..90b54c171bb 100644 --- a/src/Razor/test/testapps/RestoreTestProjects/RestoreTestProjects.csproj +++ b/src/Razor/test/testapps/RestoreTestProjects/RestoreTestProjects.csproj @@ -4,8 +4,6 @@ - - diff --git a/src/Razor/test/testapps/SimpleMvc11/Program.cs b/src/Razor/test/testapps/SimpleMvc11/Program.cs deleted file mode 100644 index 5fbbd9ded71..00000000000 --- a/src/Razor/test/testapps/SimpleMvc11/Program.cs +++ /dev/null @@ -1,13 +0,0 @@ - -namespace SimpleMvc11 -{ - public class Program - { - public static void Main(string[] args) - { - // Just make sure we have a reference to MVC 1.1 - var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult); - System.Console.WriteLine(t.FullName); - } - } -} diff --git a/src/Razor/test/testapps/SimpleMvc11/SimpleMvc11.csproj b/src/Razor/test/testapps/SimpleMvc11/SimpleMvc11.csproj deleted file mode 100644 index b1523f9512c..00000000000 --- a/src/Razor/test/testapps/SimpleMvc11/SimpleMvc11.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - netcoreapp1.1 - - - - - - - - - All - - - - diff --git a/src/Razor/test/testapps/SimpleMvc11/Views/Home/Index.cshtml b/src/Razor/test/testapps/SimpleMvc11/Views/Home/Index.cshtml deleted file mode 100644 index 00afab6a0cb..00000000000 --- a/src/Razor/test/testapps/SimpleMvc11/Views/Home/Index.cshtml +++ /dev/null @@ -1,108 +0,0 @@ -@{ - ViewData["Title"] = "Home Page"; -} - - - -
-
-

Application uses

-
    -
  • Sample pages using ASP.NET Core MVC
    • -
  • Bower for managing client-side libraries
    • -
  • Theming using Bootstrap
    • -
-
-
-

How to

- -
-
-

Overview

- -
-
-

Run & Deploy

- -
-
diff --git a/src/Razor/test/testapps/SimpleMvc11/Views/Shared/_Layout.cshtml b/src/Razor/test/testapps/SimpleMvc11/Views/Shared/_Layout.cshtml deleted file mode 100644 index 2172e5e566d..00000000000 --- a/src/Razor/test/testapps/SimpleMvc11/Views/Shared/_Layout.cshtml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - @ViewData["Title"] - SimpleMvc11 - - - - - - - - - - - - -
- @RenderBody() -
-
-

© 2018 - SimpleMvc11

-
-
- - - - - - - - - - - - - @RenderSection("Scripts", required: false) - - diff --git a/src/Razor/test/testapps/SimpleMvc11/Views/_ViewImports.cshtml b/src/Razor/test/testapps/SimpleMvc11/Views/_ViewImports.cshtml deleted file mode 100644 index 4d7ce82c245..00000000000 --- a/src/Razor/test/testapps/SimpleMvc11/Views/_ViewImports.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@using SimpleMvc11 -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers -@inject DateTime TheTime diff --git a/src/Razor/test/testapps/SimpleMvc11/Views/_ViewStart.cshtml b/src/Razor/test/testapps/SimpleMvc11/Views/_ViewStart.cshtml deleted file mode 100644 index a5f10045db9..00000000000 --- a/src/Razor/test/testapps/SimpleMvc11/Views/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "_Layout"; -} diff --git a/src/Razor/test/testapps/SimpleMvc11NetFx/Program.cs b/src/Razor/test/testapps/SimpleMvc11NetFx/Program.cs deleted file mode 100644 index 5fbbd9ded71..00000000000 --- a/src/Razor/test/testapps/SimpleMvc11NetFx/Program.cs +++ /dev/null @@ -1,13 +0,0 @@ - -namespace SimpleMvc11 -{ - public class Program - { - public static void Main(string[] args) - { - // Just make sure we have a reference to MVC 1.1 - var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult); - System.Console.WriteLine(t.FullName); - } - } -} diff --git a/src/Razor/test/testapps/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj b/src/Razor/test/testapps/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj deleted file mode 100644 index b280ec0c9c8..00000000000 --- a/src/Razor/test/testapps/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - net461 - - - - - - - - - diff --git a/src/Razor/test/testapps/SimpleMvc11NetFx/Views/Home/Index.cshtml b/src/Razor/test/testapps/SimpleMvc11NetFx/Views/Home/Index.cshtml deleted file mode 100644 index 00afab6a0cb..00000000000 --- a/src/Razor/test/testapps/SimpleMvc11NetFx/Views/Home/Index.cshtml +++ /dev/null @@ -1,108 +0,0 @@ -@{ - ViewData["Title"] = "Home Page"; -} - - - -
-
-

Application uses

-
    -
  • Sample pages using ASP.NET Core MVC
    • -
  • Bower for managing client-side libraries
    • -
  • Theming using Bootstrap
    • -
-
-
-

How to

- -
-
-

Overview

- -
-
-

Run & Deploy

- -
-
diff --git a/src/Razor/test/testapps/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml b/src/Razor/test/testapps/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml deleted file mode 100644 index 2172e5e566d..00000000000 --- a/src/Razor/test/testapps/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - @ViewData["Title"] - SimpleMvc11 - - - - - - - - - - - - -
- @RenderBody() -
-
-

© 2018 - SimpleMvc11

-
-
- - - - - - - - - - - - - @RenderSection("Scripts", required: false) - - diff --git a/src/Razor/test/testapps/SimpleMvc11NetFx/Views/_ViewImports.cshtml b/src/Razor/test/testapps/SimpleMvc11NetFx/Views/_ViewImports.cshtml deleted file mode 100644 index 6f6d009d404..00000000000 --- a/src/Razor/test/testapps/SimpleMvc11NetFx/Views/_ViewImports.cshtml +++ /dev/null @@ -1,2 +0,0 @@ -@using SimpleMvc11NetFx -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/src/Razor/test/testapps/SimpleMvc11NetFx/Views/_ViewStart.cshtml b/src/Razor/test/testapps/SimpleMvc11NetFx/Views/_ViewStart.cshtml deleted file mode 100644 index a5f10045db9..00000000000 --- a/src/Razor/test/testapps/SimpleMvc11NetFx/Views/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "_Layout"; -} From 64a81770b89d40fa137d28e0b950d83f10345d1e Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 24 Sep 2019 16:29:11 -0700 Subject: [PATCH 3/8] Update branding to 3.0.1 - aspnet/AspNetCore-Internal#3153 --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 46b02b1f982..dd97b9539f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,12 +15,12 @@ 3 0 - 0 - rc2 + 1 + servicing - true + false release diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cd5da4fbe83..f3336682c66 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,7 +12,9 @@ variables: - name: _PublishUsingPipelines value: true - name: _DotNetArtifactsCategory - value: ASPNETCORETOOLING + value: .NETCORE +- name: _DotNetValidationArtifactsCategory + value: .NETCORE trigger: batch: true @@ -296,3 +298,4 @@ stages: parameters: # See https://github.com/dotnet/arcade/issues/2871 enableSymbolValidation: false + publishInstallersAndChecksums: true diff --git a/eng/Publishing.props b/eng/Publishing.props new file mode 100644 index 00000000000..b926fa48160 --- /dev/null +++ b/eng/Publishing.props @@ -0,0 +1,40 @@ + + + + + $(ArtifactsDir.Substring(0, $([MSBuild]::Subtract($(ArtifactsDir.Length), 1)))) + + $(PublishDependsOnTargets);_PublishingBlobItems + + <_UploadPathRoot>aspnetcore-tooling + + + + + + <_ItemsToPublish Include="$(ArtifactsDir)\packages\**\*.tgz" /> + <_ItemsToPublish Include="$(ArtifactsDir)\LanguageServer\**\*.zip" /> + + + + + + + + + + <_PackageVersion>@(_ResolvedPackageVersionInfo->'%(PackageVersion)') + + + + + false + ShipInstaller=dotnetcli;NonShipping=true + true + $(_UploadPathRoot)/$(_PackageVersion)/%(Filename)%(Extension) + + + + \ No newline at end of file diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets new file mode 100644 index 00000000000..3a51f4bc4cb --- /dev/null +++ b/eng/targets/Packaging.targets @@ -0,0 +1,14 @@ + + + + + + <_ProjectPathWithVersion Include="$(MSBuildProjectFullPath)"> + $(PackageId) + $(PackageVersion) + $(VersionSuffix) + $(PackageId.Replace('.',''))PackageVersion + + + + \ No newline at end of file From 725501d1dd11120e2dcb1dcb5e28dfb4e26e3795 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Mon, 23 Sep 2019 15:43:59 -0700 Subject: [PATCH 5/8] Fix CSProj path --- eng/Publishing.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index b926fa48160..589acafdd6c 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -17,8 +17,8 @@ - - + From 95a1f348631eb63905c54f5f65ed944e438d7de8 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Tue, 24 Sep 2019 11:10:08 -0700 Subject: [PATCH 6/8] Update Validation artifacts category --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f3336682c66..5464570edfe 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -14,7 +14,7 @@ variables: - name: _DotNetArtifactsCategory value: .NETCORE - name: _DotNetValidationArtifactsCategory - value: .NETCORE + value: .NETCOREVALIDATION trigger: batch: true From 1ef76f9d6f0b938ee6e2209528a3a39127dc58e3 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Wed, 25 Sep 2019 13:14:23 -0700 Subject: [PATCH 7/8] Fix LanguageServer PackageVersion info. --- eng/AfterSigning.targets | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/eng/AfterSigning.targets b/eng/AfterSigning.targets index 5f671b3b367..88a266e8bc9 100644 --- a/eng/AfterSigning.targets +++ b/eng/AfterSigning.targets @@ -10,17 +10,25 @@ + + + + + $(ArtifactsDir)LanguageServer\$(Configuration)\ $(RidsPublishDir) + <_PackageVersion>@(_ResolvedPackageVersionInfo->'%(PackageVersion)') %(LanguageServiceBinaryDir.Identity) - $(ZipOutputDir)RazorLanguageServer-%(LanguageServiceBinaryDir.Filename)-$(PackageVersion).zip + $(ZipOutputDir)RazorLanguageServer-%(LanguageServiceBinaryDir.Filename)-$(_PackageVersion).zip From 2dfff0f35cee1067dd2462b46e8ac906155bfdc9 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Wed, 25 Sep 2019 15:44:07 -0700 Subject: [PATCH 8/8] Correct bad merge --- eng/Versions.props | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/Versions.props b/eng/Versions.props index 1249e4ba58f..4f352c9e5a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,6 +16,7 @@ 5 0 0 + alpha1