Skip to content

[automated] Merge branch 'release/3.1' => 'master' #1173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dougbu merged 11 commits into from
Oct 4, 2019
Merged

[automated] Merge branch 'release/3.1' => 'master' #1173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e283d0b
Capture process dumps for child dotnet processes (#1170)
javiercn Sep 25, 2019
bd71bcf
Remove 1.x tests (#1169)
ajaybhargavb Sep 25, 2019
64a8177
Update branding to 3.0.1
dougbu Sep 24, 2019
d6a5a27
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
dougbu Sep 25, 2019
0a3d378
Publish all things Razor.VSCode
Sep 23, 2019
725501d
Fix CSProj path
Sep 23, 2019
95a1f34
Update Validation artifacts category
Sep 24, 2019
1ef76f9
Fix LanguageServer PackageVersion info.
Sep 25, 2019
bd313a1
Merge branch 'release/3.0' => 'release/3.1' (#1174)
dougbu Sep 25, 2019
a2ffe16
Merge branch 'master' into merge/release/3.1-to-master
dougbu Sep 25, 2019
2dfff0f
Correct bad merge
dougbu Sep 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
</PropertyGroup>

<Import Project="eng\MPack.targets" />
<Import Project="eng\targets\Packaging.targets" />
<Import Project="eng\targets\Npm.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.npmproj'" />

<!-- Workaround https://github.com/dotnet/cli/issues/10528 -->
Expand Down
5 changes: 4 additions & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ variables:
- name: _PublishUsingPipelines
value: true
- name: _DotNetArtifactsCategory
value: ASPNETCORETOOLING
value: .NETCORE
- name: _DotNetValidationArtifactsCategory
value: .NETCOREVALIDATION

trigger:
batch: true
Expand Down Expand Up @@ -296,3 +298,4 @@ stages:
parameters:
# See https://github.com/dotnet/arcade/issues/2871
enableSymbolValidation: false
publishInstallersAndChecksums: true
10 changes: 9 additions & 1 deletion eng/AfterSigning.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,25 @@
</Target>

<Target Name="_ZipLanguageServerBinaries" AfterTargets="Pack" Condition=" '$(OS)' == 'Windows_NT' ">
<!-- This target is defined in eng/targets/Packaging.targets and included in every project. -->
<MSBuild Projects="$(RepoRoot)src\Razor\src\Microsoft.AspNetCore.Razor.Language\Microsoft.AspNetCore.Razor.Language.csproj"
Targets="_GetPackageVersionInfo"
SkipNonexistentProjects="false">
<Output TaskParameter="TargetOutputs" ItemName="_ResolvedPackageVersionInfo" />
</MSBuild>

<!-- Build a .zip file from each platform's directory and write it to 'artifacts' -->
<PropertyGroup>
<RidsPublishDir>$(ArtifactsDir)LanguageServer\$(Configuration)\</RidsPublishDir>
<ZipOutputDir>$(RidsPublishDir)</ZipOutputDir>
<_PackageVersion>@(_ResolvedPackageVersionInfo->'%(PackageVersion)')</_PackageVersion>
</PropertyGroup>

<ItemGroup>
<LanguageServiceBinaryDir Include="$([System.IO.Directory]::GetDirectories(&quot;$(RidsPublishDir)&quot;))" />
<LanguageServiceBinary Include="@(LanguageServiceBinaryDir)">
<SourceDir>%(LanguageServiceBinaryDir.Identity)</SourceDir>
<ZipFile>$(ZipOutputDir)RazorLanguageServer-%(LanguageServiceBinaryDir.Filename)-$(PackageVersion).zip</ZipFile>
<ZipFile>$(ZipOutputDir)RazorLanguageServer-%(LanguageServiceBinaryDir.Filename)-$(_PackageVersion).zip</ZipFile>
</LanguageServiceBinary>
</ItemGroup>

Expand Down
40 changes: 40 additions & 0 deletions eng/Publishing.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<!-- The one use of ArtifactsDir in Publish.proj adds an additional slash, confusing itself. -->
<ArtifactsDir Condition=" HasTrailingSlash('$(ArtifactsDir)') ">$(ArtifactsDir.Substring(0, $([MSBuild]::Subtract($(ArtifactsDir.Length), 1))))</ArtifactsDir>

<PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishingBlobItems</PublishDependsOnTargets>

<_UploadPathRoot>aspnetcore-tooling</_UploadPathRoot>
</PropertyGroup>

<!-- $(InstallersOutputPath) and $(SymbolsOutputPath) are not defined. Root Directory.Build.props is not imported. -->
<ItemGroup>
<!-- Prepare for _PublishingBlobItems target. -->
<_ItemsToPublish Include="$(ArtifactsDir)\packages\**\*.tgz" />
<_ItemsToPublish Include="$(ArtifactsDir)\LanguageServer\**\*.zip" />
</ItemGroup>

<Target Name="_PublishingBlobItems">
<!-- This target is defined in eng/targets/Packaging.targets and included in every project. -->
<MSBuild Projects="$(RepoRoot)src\Razor\src\Microsoft.AspNetCore.Razor.Language\Microsoft.AspNetCore.Razor.Language.csproj"
Targets="_GetPackageVersionInfo"
SkipNonexistentProjects="false">
<Output TaskParameter="TargetOutputs" ItemName="_ResolvedPackageVersionInfo" />
</MSBuild>

<PropertyGroup>
<_PackageVersion>@(_ResolvedPackageVersionInfo->'%(PackageVersion)')</_PackageVersion>
</PropertyGroup>

<ItemGroup>
<ItemsToPushToBlobFeed Include="@(_ItemsToPublish)">
<IsShipping>false</IsShipping>
<ManifestArtifactData>ShipInstaller=dotnetcli;NonShipping=true</ManifestArtifactData>
<PublishFlatContainer>true</PublishFlatContainer>
<RelativeBlobPath>$(_UploadPathRoot)/$(_PackageVersion)/%(Filename)%(Extension)</RelativeBlobPath>
</ItemsToPushToBlobFeed>
</ItemGroup>
</Target>
</Project>
5 changes: 5 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
<MinorVersion>0</MinorVersion>
<PatchVersion>0</PatchVersion>
<PreReleaseVersionLabel>alpha1</PreReleaseVersionLabel>
<!--
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
-->
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
<DefaultNetCoreTargetFramework>netcoreapp$(MajorVersion).$(MinorVersion)</DefaultNetCoreTargetFramework>
</PropertyGroup>
<!--
Expand Down
14 changes: 14 additions & 0 deletions eng/targets/Packaging.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<!-- This target is used to get the package versions of projects -->
<Target Name="_GetPackageVersionInfo" Returns="@(_ProjectPathWithVersion)">
<ItemGroup>
<_ProjectPathWithVersion Include="$(MSBuildProjectFullPath)">
<PackageId>$(PackageId)</PackageId>
<PackageVersion>$(PackageVersion)</PackageVersion>
<VersionSuffix>$(VersionSuffix)</VersionSuffix>
<VersionVariableName>$(PackageId.Replace('.',''))PackageVersion</VersionVariableName>
</_ProjectPathWithVersion>
</ItemGroup>
</Target>
</Project>
49 changes: 0 additions & 49 deletions src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.FunctionalTest/tests/Completions1_0.test.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.FunctionalTest/tests/TestUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
58 changes: 0 additions & 58 deletions src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildIntegrationTest11.cs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/Razor/test/testapps/RestoreTestProjects/RestoreTestProjects.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\SimpleMvc11NetFx\SimpleMvc11NetFx.csproj" />
<ProjectReference Include="..\SimpleMvc11\SimpleMvc11.csproj" />
<ProjectReference Include="..\SimpleMvc21\SimpleMvc21.csproj" />
<ProjectReference Include="..\SimpleMvc22\SimpleMvc22.csproj" />
<ProjectReference Include="..\SimpleMvc22NetFx\SimpleMvc22NetFx.csproj" />
Expand Down
13 changes: 0 additions & 13 deletions src/Razor/test/testapps/SimpleMvc11/Program.cs
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions src/Razor/test/testapps/SimpleMvc11/SimpleMvc11.csproj
View file
Open in desktop

This file was deleted.

108 changes: 0 additions & 108 deletions src/Razor/test/testapps/SimpleMvc11/Views/Home/Index.cshtml
View file
Open in desktop

This file was deleted.

Loading