diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index f25afe0f13..50bd3d72e0 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -151,7 +151,7 @@ stages: $(_InternalRuntimeDownloadArgs) displayName: Build x86 - # This is in a separate build step with -forceCoreMsbuild to workaround MAX_PATH limitations - https://github.com/Microsoft/msbuild/issues/53 + # This is in a separate build step with to workaround MAX_PATH limitations - https://github.com/Microsoft/msbuild/issues/53 - script: .\src\SiteExtensions\build.cmd -ci -nobl diff --git a/Directory.Build.props b/Directory.Build.props index da65ca2c01..edd4ebe1aa 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -56,6 +56,7 @@ true + net5.0 @@ -70,6 +71,9 @@ $(NoWarn);NU5131 $(NoWarn);NU5048 + + + $(NoWarn);RS1024;RS1025;RS1026 diff --git a/eng/Build.props b/eng/Build.props index dba58547cf..31c08d2690 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -166,6 +166,7 @@ Exclude=" @(ProjectToBuild); @(ProjectToExclude); + $(RepoRoot)src\Razor\test\testassets\**\*.*proj; $(RepoRoot)**\node_modules\**\*; $(RepoRoot)**\bin\**\*; $(RepoRoot)**\obj\**\*;" @@ -202,6 +203,7 @@ Exclude=" @(ProjectToBuild); @(ProjectToExclude); + $(RepoRoot)src\Razor\test\testassets\**\*.*proj; $(RepoRoot)**\node_modules\**\*; $(RepoRoot)**\bin\**\*; $(RepoRoot)**\obj\**\*;" diff --git a/eng/Dependencies.props b/eng/Dependencies.props index a98ee06a83..9395da7547 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -20,13 +20,10 @@ and are generated based on the last package release. - - - @@ -71,6 +68,7 @@ and are generated based on the last package release. + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index a7d42c3782..3ff50b3b1a 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -41,6 +41,13 @@ + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd93fa38e8..e123ee0155 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,22 +13,6 @@ https://github.com/dotnet/blazor dd7fb4d3931d556458f62642c2edfc59f6295bfb - - https://github.com/dotnet/aspnetcore-tooling - e759982cb63d5205b87ad0d968b09033ab778d12 - - - https://github.com/dotnet/aspnetcore-tooling - e759982cb63d5205b87ad0d968b09033ab778d12 - - - https://github.com/dotnet/aspnetcore-tooling - e759982cb63d5205b87ad0d968b09033ab778d12 - - - https://github.com/dotnet/aspnetcore-tooling - e759982cb63d5205b87ad0d968b09033ab778d12 - https://github.com/dotnet/efcore 7f81b608c2ceb19f6072b8b3cec6ad45fcc2d6a9 @@ -205,6 +189,10 @@ https://github.com/dotnet/runtime bdd7235c43d762cea051cfc2071e14de48175f0c + + https://github.com/dotnet/runtime + bdd7235c43d762cea051cfc2071e14de48175f0c + https://github.com/dotnet/runtime bdd7235c43d762cea051cfc2071e14de48175f0c diff --git a/eng/Versions.props b/eng/Versions.props index 8e1872c0a9..16de37bb56 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,7 @@ 5.0.0-preview.6.20264.1 5.0.0-preview.6.20264.1 5.0.0-preview.6.20264.1 + 5.0.0-preview.6.20264.1 5.0.0-preview.6.20264.1 5.0.0-preview.6.20264.1 5.0.0-preview.6.20264.1 @@ -136,11 +137,6 @@ 5.0.0-preview.6.20264.4 5.0.0-preview.6.20264.4 5.0.0-preview.6.20264.4 - - 5.0.0-preview.6.20265.5 - 5.0.0-preview.6.20265.5 - 5.0.0-preview.6.20265.5 - 5.0.0-preview.6.20265.5 + 9.0.1 + 13.0.4 3.12.1 17.17134.0 diff --git a/eng/targets/CSharp.Common.props b/eng/targets/CSharp.Common.props index 03e6f56e37..412aa80c54 100644 --- a/eng/targets/CSharp.Common.props +++ b/eng/targets/CSharp.Common.props @@ -14,13 +14,29 @@ - - - - + + + + + + + TargetFramework=$(DefaultNetCoreTargetFramework) + TargetFramework=net46 + + + + + $(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\sdk-output\ + + + + + + diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index faab16abde..aef4daf845 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -86,7 +86,8 @@ @(AspNetCoreAppReferenceAndPackage); @(ExternalAspNetCoreAppReference); @(_CompilationOnlyReference); - @(Reference->WithMetadataValue('IsSharedSource', 'true'))" /> + @(Reference->WithMetadataValue('IsSharedSource', 'true')); + @(Reference->WithMetadataValue('PrivateAssets', 'All'))" /> <_OriginalReferences Include="@(Reference)" /> - - + + + + + ${ArtifactsBinDir}Microsoft.NET.Sdk.Razor\${Configuration}\sdk-output\ + diff --git a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets index 948108395a..11a279d368 100644 --- a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets +++ b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets @@ -37,6 +37,9 @@ MicrosoftAspNetCoreAppRuntimePackageVersion=@(_RuntimePackageVersionInfo->'%(PackageVersion)'); SupportedRuntimeIdentifiers=$(SupportedRuntimeIdentifiers); DefaultNetCoreTargetFramework=$(DefaultNetCoreTargetFramework); + RepoRoot=$(RepoRoot); + Configuration=$(Configuration); + ArtifactsBinDir=$(ArtifactsBinDir); diff --git a/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in b/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in index 1d3fb7bb2a..7db32362ad 100644 --- a/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in +++ b/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in @@ -29,11 +29,14 @@ IsImplicitlyDefined="true" /> - - - - + + + + + ${ArtifactsBinDir}Microsoft.NET.Sdk.Razor\${Configuration}\sdk-output\ + diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj index f949a8e8ca..9d62cf14d3 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj @@ -6,17 +6,19 @@ $(PackageTags);aspnetcoremvc false false + + false - + Shared\CodeWriterExtensions.cs - - + + diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs index bb605fed72..86eb6afc0d 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs @@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.IntegrationTests private readonly static CSharpCompilation DefaultBaseCompilation = MvcShim.BaseCompilation.WithAssemblyName("AppCode"); public CodeGenerationIntegrationTest() - : base(generateBaselines: null) + : base(generateBaselines: null, projectDirectoryHint: "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X") { Configuration = RazorConfiguration.Create( RazorLanguageVersion.Version_1_1, @@ -311,7 +311,7 @@ public class ThisShouldBeGenerated var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics; Assert.Equal("RZ2001", Assert.Single(diagnotics).Id); } - + [Fact] public void ModelExpressionTagHelper_DesignTime() { diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj index 63812740f1..ab5f289eac 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj @@ -1,12 +1,16 @@  - $(StandardTestTfms) + $(DefaultNetCoreTargetFramework) + $(TargetFrameworks);net461 true $(DefaultItemExcludes);TestFiles\** false + + + false @@ -15,18 +19,13 @@ - - + + + + - - - - - - - - - + + diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj index ce96dad3fe..e39329c7bd 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj @@ -5,17 +5,19 @@ netstandard2.0 $(PackageTags);aspnetcoremvc false + + false - + Shared\CodeWriterExtensions.cs - - + + diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs index 367b72d260..0fa87ec5f7 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/CodeGenerationIntegrationTest.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IntegrationTests private readonly static CSharpCompilation DefaultBaseCompilation = MvcShim.BaseCompilation.WithAssemblyName("AppCode"); public CodeGenerationIntegrationTest() - : base(generateBaselines: null) + : base(generateBaselines: null, projectDirectoryHint: "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X") { Configuration = RazorConfiguration.Create( RazorLanguageVersion.Version_2_0, diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/InstrumentationPassIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/InstrumentationPassIntegrationTest.cs index 58d6a46df0..4a4e752c37 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/InstrumentationPassIntegrationTest.cs +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/IntegrationTests/InstrumentationPassIntegrationTest.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IntegrationTests private readonly static CSharpCompilation DefaultBaseCompilation = MvcShim.BaseCompilation.WithAssemblyName("AppCode"); public InstrumentationPassIntegrationTest() - : base(generateBaselines: null) + : base(generateBaselines: null, projectDirectoryHint: "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X") { Configuration = RazorConfiguration.Create( RazorLanguageVersion.Version_2_0, @@ -63,7 +63,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IntegrationTests { b.AddTagHelpers(descriptors); b.Features.Add(new InstrumentationPass()); - + // This test includes templates b.AddTargetExtension(new TemplateTargetExtension()); }); diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj index 35ed6aa142..f9cddae411 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj @@ -1,12 +1,16 @@  - $(StandardTestTfms) + $(DefaultNetCoreTargetFramework) + $(TargetFrameworks);net461 true $(DefaultItemExcludes);TestFiles\** false + + + false @@ -15,18 +19,13 @@ - - + + + + - - - - - - - - - + + diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj index afa5ecd679..6f4a9eb8c3 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj @@ -4,17 +4,19 @@ ASP.NET Core design time hosting infrastructure for the Razor view engine. netstandard2.0 $(PackageTags);aspnetcoremvc + + false - - - + + + - - + + diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs index 150d4e012b..ae4d3ec872 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.IntegrationTests private readonly static CSharpCompilation DefaultBaseCompilation = MvcShim.BaseCompilation.WithAssemblyName("AppCode"); public CodeGenerationIntegrationTest() - : base(generateBaselines: null) + : base(generateBaselines: null, projectDirectoryHint: "Microsoft.AspNetCore.Mvc.Razor.Extensions") { Configuration = RazorConfiguration.Create( RazorLanguageVersion.Version_3_0, diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj index 8609730955..09f9010d33 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj @@ -1,12 +1,16 @@  - $(StandardTestTfms) + $(DefaultNetCoreTargetFramework) + $(TargetFrameworks);net461 true $(DefaultItemExcludes);TestFiles\** false + + + false @@ -15,17 +19,12 @@ - - - - - - - - - - - + + + + + + diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj index 1fd7aeebf5..b32f5c3620 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj @@ -3,10 +3,12 @@ Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor parser and code generation infrastructure. netstandard2.0 + + false - + diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj index 120eee7bb4..f60d341f39 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj @@ -1,12 +1,16 @@ - $(StandardTestTfms) + $(DefaultNetCoreTargetFramework) + $(TargetFrameworks);net461 $(DefaultItemExcludes);TestFiles\**\* $(DefineConstants);GENERATE_BASELINES false + + + false @@ -15,14 +19,9 @@ - - - - - - - - + + + diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj index ffda95c107..30885c51f1 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj +++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj @@ -20,24 +20,27 @@ false + + + false - + Shared\TagHelperDescriptorJsonConverter.cs - + Shared\RazorDiagnosticJsonConverter.cs + - - + - + diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj index 8430edfc23..78dbc7d7b8 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj +++ b/src/Razor/Microsoft.AspNetCore.Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj @@ -3,16 +3,14 @@ $(DefaultNetCoreTargetFramework) $(DefaultItemExcludes);TestFiles\** + + + false - - - - - - - + + diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Microsoft.CodeAnalysis.Razor.csproj b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Microsoft.CodeAnalysis.Razor.csproj index 5a294ccb6c..f1daa4666a 100644 --- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Microsoft.CodeAnalysis.Razor.csproj +++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Microsoft.CodeAnalysis.Razor.csproj @@ -3,14 +3,13 @@ Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure. netstandard2.0 + + false - - - - - - + + + diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/TextChangeExtensions.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/TextChangeExtensions.cs index 95fd6ba899..e200b5205a 100644 --- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/TextChangeExtensions.cs +++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/TextChangeExtensions.cs @@ -11,11 +11,6 @@ namespace Microsoft.CodeAnalysis.Razor { public static SourceChange AsSourceChange(this TextChange textChange) { - if (textChange == null) - { - throw new ArgumentNullException(nameof(textChange)); - } - return new SourceChange(textChange.Span.AsSourceSpan(), textChange.NewText); } } diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj b/src/Razor/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj index 44fb5d161b..b4fd5a0f6f 100644 --- a/src/Razor/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj +++ b/src/Razor/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj @@ -1,9 +1,13 @@  - $(StandardTestTfms) + $(DefaultNetCoreTargetFramework) + $(TargetFrameworks);net461 $(DefaultItemExcludes);TestFiles\**\* true + + + false @@ -12,18 +16,14 @@ - - - + + + + + - - - - - - - + diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj index ba32df8e28..0f65a8fc2e 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj +++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj @@ -13,47 +13,56 @@ $(NoWarn);NU5100 $(NoWarn);NU5129 + + $(NoWarn);MSB3030;MSB4181 + + true + + false - - - - + + + - - + + - + Shared\ServerProtocol\%(FileName) - + Shared\PipeName.cs - + Shared\MutexName.cs - + Shared\Client.cs + - + + Projects="..\..\Microsoft.AspNetCore.Razor.Tools\src\Microsoft.AspNetCore.Razor.Tools.csproj" + Properties="PublishDir=$(SdkOutputPath)temp;TargetFramework=netcoreapp3.0" + Targets="Publish" + ContinueOnError="true" /> + - + + @@ -65,9 +74,17 @@ - + + + + + + <_PreparedRazorSdkFiles Include="$(SdkOutputPath)**\*.*" /> + + + diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs index d213b173c1..544e98e281 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs @@ -1,41 +1,24 @@ // 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.Collections.Generic; +using System.Linq; +using System.Reflection; + namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests { internal static partial class BuildVariables { - private static string _msBuildPath = string.Empty; - private static string _MicrosoftNETCoreApp50PackageVersion = string.Empty; - private static string _microsoftNetCompilersToolsetPackageVersion = string.Empty; + private static readonly IEnumerable TestAssemblyMetadata = Assembly.GetExecutingAssembly().GetCustomAttributes(); - static partial void InitializeVariables(); + public static string MSBuildPath => TestAssemblyMetadata.SingleOrDefault(a => a.Key == "DesktopMSBuildPath").Value; - public static string MSBuildPath - { - get - { - InitializeVariables(); - return _msBuildPath; - } - } + public static string MicrosoftNETCoreAppRuntimeVersion => TestAssemblyMetadata.SingleOrDefault(a => a.Key == "MicrosoftNETCoreAppRuntimeVersion").Value; - public static string MicrosoftNETCoreApp50PackageVersion - { - get - { - InitializeVariables(); - return _MicrosoftNETCoreApp50PackageVersion; - } - } + public static string MicrosoftNetCompilersToolsetPackageVersion => TestAssemblyMetadata.SingleOrDefault(a => a.Key == "MicrosoftNetCompilersToolsetPackageVersion").Value; - public static string MicrosoftNetCompilersToolsetPackageVersion - { - get - { - InitializeVariables(); - return _microsoftNetCompilersToolsetPackageVersion; - } - } + public static string RazorSdkDirectoryRoot => TestAssemblyMetadata.SingleOrDefault(a => a.Key == "RazorSdkDirectoryRoot").Value; + + public static string RepoRoot => TestAssemblyMetadata.SingleOrDefault(a => a.Key == "Testing.RepoRoot").Value; } } diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs index db779af38f..ec8b5b44be 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildServerIntegrationTest.cs @@ -157,7 +157,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests // Publish rzc tool to a temporary path. This is the location based on which the pipe name is generated. var repositoryRoot = ProjectDirectory.SearchUp(AppContext.BaseDirectory, "global.json"); var solutionRoot = Path.Combine(repositoryRoot, "src", "Razor"); - var toolAssemblyDirectory = Path.Combine(solutionRoot, "src", "Microsoft.AspNetCore.Razor.Tools"); + var toolAssemblyDirectory = Path.Combine(solutionRoot, "Microsoft.AspNetCore.Razor.Tools", "src"); var toolAssemblyPath = Path.Combine(toolAssemblyDirectory, "Microsoft.AspNetCore.Razor.Tools.csproj"); var projectDirectory = new TestProjectDirectory(solutionRoot, toolAssemblyDirectory, toolAssemblyPath); var publishDir = Path.Combine(Path.GetTempPath(), "Razor", Path.GetRandomFileName(), "RzcPublish"); diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs index d79ec34f56..ff17163390 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs @@ -80,8 +80,10 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests // Let the test app know it is running as part of a test. "/p:RunningAsTest=true", - $"/p:MicrosoftNETCoreApp50PackageVersion={BuildVariables.MicrosoftNETCoreApp50PackageVersion}", + $"/p:MicrosoftNETCoreAppRuntimeVersion={BuildVariables.MicrosoftNETCoreAppRuntimeVersion}", $"/p:MicrosoftNetCompilersToolsetPackageVersion={BuildVariables.MicrosoftNetCompilersToolsetPackageVersion}", + $"/p:RazorSdkDirectoryRoot={BuildVariables.RazorSdkDirectoryRoot}", + $"/p:RepoRoot={BuildVariables.RepoRoot}", }; if (!suppressBuildServer) diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ProjectDirectory.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ProjectDirectory.cs index 1506165b14..e2a28a1b06 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ProjectDirectory.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ProjectDirectory.cs @@ -30,18 +30,13 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests throw new InvalidOperationException($"{destinationPath} should be empty"); } - var repositoryRoot = SearchUp(AppContext.BaseDirectory, "global.json"); - if (repositoryRoot == null) - { - throw new InvalidOperationException("Could not find repository root."); - } - + var repositoryRoot = BuildVariables.RepoRoot; var solutionRoot = Path.Combine(repositoryRoot, "src", "Razor"); var binariesRoot = Path.GetDirectoryName(typeof(ProjectDirectory).Assembly.Location); foreach (var project in new string[] { originalProjectName, }.Concat(additionalProjects)) { - var testAppsRoot = Path.Combine(solutionRoot, "test", "testapps"); + var testAppsRoot = Path.Combine(solutionRoot, "test", "testassets"); var projectRoot = Path.Combine(testAppsRoot, project); if (!Directory.Exists(projectRoot)) { @@ -51,7 +46,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests var projectDestination = Path.Combine(destinationPath, project); var projectDestinationDir = Directory.CreateDirectory(projectDestination); CopyDirectory(new DirectoryInfo(projectRoot), projectDestinationDir); - SetupDirectoryBuildFiles(solutionRoot, binariesRoot, testAppsRoot, projectDestination); + SetupDirectoryBuildFiles(repositoryRoot, binariesRoot, testAppsRoot, projectDestination); } // Rename the csproj/fsproj @@ -120,12 +115,13 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests } } - void SetupDirectoryBuildFiles(string solutionRoot, string binariesRoot, string testAppsRoot, string projectDestination) + void SetupDirectoryBuildFiles(string repoRoot, string binariesRoot, string testAppsRoot, string projectDestination) { var beforeDirectoryPropsContent = $@" - {solutionRoot} + {repoRoot} + {BuildVariables.RazorSdkDirectoryRoot} {binariesRoot} "; diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj index e6cb9bd946..437588e3df 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj +++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj @@ -13,6 +13,9 @@ true $(MSBuildProjectDirectory)\obj\BuildVariables.generated.cs + + + false @@ -21,16 +24,14 @@ - - - - + + <_Parameter1>Testing.AdditionalRestoreSources - <_Parameter2>$(MSBuildThisFileDirectory)..\testapps\PregeneratedPackages + <_Parameter2>$(MSBuildThisFileDirectory)..\testassets\PregeneratedPackages @@ -48,84 +49,73 @@ <_Parameter2>$(RepoRoot) - + + <_Parameter1>MicrosoftNETCoreAppRuntimeVersion + <_Parameter2>$(MicrosoftNETCoreAppRuntimeVersion) + + + + <_Parameter1>MicrosoftNetCompilersToolsetPackageVersion + <_Parameter2>$(MicrosoftNetCompilersToolsetPackageVersion) + + + + <_Parameter1>RazorSdkDirectoryRoot + <_Parameter2>$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\sdk-output\ + - - - - - - + + + + + - + + TargetFramework=netstandard2.0 + $(IntermediateOutputPath)BuildVariables.generated.cs - - + - + <_DesktopMSBuildPath Condition="'$(OS)' == 'Windows_NT' and Exists('$(_VSInstallDir)\MSBuild\Current\Bin\msbuild.exe')">$(_VSInstallDir)\MSBuild\Current\Bin\msbuild.exe <_DesktopMSBuildPath Condition="'$(OS)' == 'Windows_NT' and Exists('$(_VSInstallDir)\MSBuild\15.0\Bin\msbuild.exe')">$(_VSInstallDir)\MSBuild\15.0\Bin\msbuild.exe - <_Content> - - + - - - - false - - + + <_Parameter1>DesktopMSBuildPath + <_Parameter2>$(_DesktopMSBuildPath) + - - - - - + + + netcoreapp1.1 net461 - - + + diff --git a/src/Razor/test/Directory.Build.props b/src/Razor/test/Directory.Build.props new file mode 100644 index 0000000000..dce1b5bf03 --- /dev/null +++ b/src/Razor/test/Directory.Build.props @@ -0,0 +1,7 @@ + + + + + true + + diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs index 1f50719819..fa8d6cf1a5 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs @@ -47,9 +47,9 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary)); } - protected IntegrationTestBase(bool? generateBaselines = null) + protected IntegrationTestBase(bool? generateBaselines = null, string? projectDirectoryHint = null) { - TestProjectRoot = TestProject.GetProjectDirectory(GetType()); + TestProjectRoot = projectDirectoryHint == null ? TestProject.GetProjectDirectory(GetType()) : TestProject.GetProjectDirectory(projectDirectoryHint); if (generateBaselines.HasValue) { @@ -85,13 +85,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests protected virtual bool DesignTime { get; } = false; /// - /// Gets the + /// Gets the /// internal VirtualRazorProjectFileSystem FileSystem { get; } = new VirtualRazorProjectFileSystem(); /// - /// Used to force a specific style of line-endings for testing. This matters for the baseline tests that exercise line mappings. - /// Even though we normalize newlines for testing, the difference between platforms affects the data through the *count* of + /// Used to force a specific style of line-endings for testing. This matters for the baseline tests that exercise line mappings. + /// Even though we normalize newlines for testing, the difference between platforms affects the data through the *count* of /// characters written. /// protected virtual string LineEnding { get; } = "\r\n"; @@ -160,7 +160,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests { Content = text, }; - + return projectItem; } @@ -206,7 +206,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests { Content = fileContent, }; - + return projectItem; } @@ -491,12 +491,6 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests { var span = spans[i]; var sourceSpan = span.GetSourceSpan(codeDocument.Source); - if (sourceSpan == null) - { - // Not in the main file, skip. - continue; - } - var expectedSpan = sourceContent.Substring(sourceSpan.AbsoluteIndex, sourceSpan.Length); // See #2593 diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestProject.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestProject.cs index a36a57b983..9d6c52df19 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestProject.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestProject.cs @@ -8,15 +8,35 @@ namespace Microsoft.AspNetCore.Razor.Language { public static class TestProject { + public static string GetProjectDirectory(string directoryHint) + { + var repoRoot = SearchUp(AppContext.BaseDirectory, "global.json"); + var projectDirectory = Path.Combine(repoRoot, "src", "Razor", directoryHint, "test"); + + if (!Directory.Exists(projectDirectory) && + string.Equals(directoryHint, "Microsoft.AspNetCore.Razor.Language.Test", StringComparison.Ordinal)) + { + projectDirectory = Path.Combine(repoRoot, "src", "Razor", "Microsoft.AspNetCore.Razor.Language", "test"); + } + + if (!Directory.Exists(projectDirectory)) + { + throw new InvalidOperationException( + $@"Could not locate project directory for directory hint {directoryHint}. Directory probe path: {projectDirectory}."); + } + + return projectDirectory; + } + public static string GetProjectDirectory(Type type) { var repoRoot = SearchUp(AppContext.BaseDirectory, "global.json"); var assemblyName = type.Assembly.GetName().Name; - var projectDirectory = Path.Combine(repoRoot, "src", "Razor", "test", assemblyName); + var projectDirectory = Path.Combine(repoRoot, "src", "Razor", assemblyName, "test"); if (!Directory.Exists(projectDirectory) && string.Equals(assemblyName, "Microsoft.AspNetCore.Razor.Language.Test", StringComparison.Ordinal)) { - projectDirectory = Path.Combine(repoRoot, "src", "Razor", "test", "RazorLanguage.Test"); + projectDirectory = Path.Combine(repoRoot, "src", "Razor", "Microsoft.AspNetCore.Razor.Language", "test"); } if (!Directory.Exists(projectDirectory)) diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj index d0c78e7bdf..73f5cd3f3a 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj @@ -8,15 +8,15 @@ - - - - - - - + + + + + + + diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj index 756371e76d..b7df50da77 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj @@ -2,6 +2,7 @@ netstandard2.0;net461 + true diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj index 8ce2215ec2..400513f82b 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj index 2708eb193f..583b94d948 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj index 2708eb193f..583b94d948 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj index 4b556f73e1..0d860cdd09 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj index 6102fad181..55d3ad9e66 100644 --- a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj +++ b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj @@ -1,9 +1,5 @@ - - $(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\ - - $(DefaultNetCoreTargetFramework) @@ -26,7 +22,7 @@ - $(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ + $(RepoRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ diff --git a/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj b/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj index a082defa12..81cbd55044 100644 --- a/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj +++ b/src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj @@ -1,12 +1,8 @@ - - $(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\ - - $(DefaultNetCoreTargetFramework) - $(MSBuildThisFileDirectory)..\PregeneratedPackages\ + $(MSBuildThisFileDirectory)..\PregeneratedPackages\ $(RestoreAdditionalProjectSources);$(RuntimeAdditionalRestoreSources) @@ -32,7 +28,7 @@ - $(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ + $(RepoRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ diff --git a/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj b/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj index 9a11149cd1..8083a90bb5 100644 --- a/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj +++ b/src/Razor/test/testassets/AppWithPackageAndP2PReferenceAndRID/AppWithPackageAndP2PReferenceAndRID.csproj @@ -1,9 +1,5 @@ - - $(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\ - - $(DefaultNetCoreTargetFramework) win-x64 @@ -36,7 +32,7 @@ - $(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ + $(RepoRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ diff --git a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj index 87ec461496..42c33c219c 100644 --- a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj +++ b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj @@ -1,9 +1,5 @@ - - $(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\ - - true @@ -23,7 +19,7 @@ - $(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ + $(RepoRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ diff --git a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj index 0a331a69c0..75deedd8cb 100644 --- a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj +++ b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj @@ -1,9 +1,5 @@ - - $(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\ - - $(DefaultNetCoreTargetFramework) true @@ -20,7 +16,7 @@ - $(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ + $(RepoRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ diff --git a/src/Razor/test/testassets/ClassLibraryMvc21/ClassLibraryMvc21.csproj b/src/Razor/test/testassets/ClassLibraryMvc21/ClassLibraryMvc21.csproj index 04fdcf55f3..a554aab0ff 100644 --- a/src/Razor/test/testassets/ClassLibraryMvc21/ClassLibraryMvc21.csproj +++ b/src/Razor/test/testassets/ClassLibraryMvc21/ClassLibraryMvc21.csproj @@ -1,14 +1,14 @@ - netstandard2.0 - + diff --git a/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj b/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj index 488b36eb48..423d24e807 100644 --- a/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj +++ b/src/Razor/test/testassets/ComponentApp/ComponentApp.csproj @@ -1,9 +1,5 @@ - - $(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\ - - $(DefaultNetCoreTargetFramework) @@ -20,7 +16,7 @@ - $(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ + $(RepoRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ diff --git a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj index 06baf7f0ad..1974c2992d 100644 --- a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj +++ b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj @@ -1,8 +1,4 @@ - - - $(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\ - netstandard2.0 @@ -16,7 +12,7 @@ - $(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ + $(RepoRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ diff --git a/src/Razor/test/testassets/Directory.Build.props b/src/Razor/test/testassets/Directory.Build.props index 9515093308..d1187f882b 100644 --- a/src/Razor/test/testassets/Directory.Build.props +++ b/src/Razor/test/testassets/Directory.Build.props @@ -2,10 +2,6 @@ - $(MSBuildThisFileDirectory)..\..\ - $([MSBuild]::EnsureTrailingSlash('$(SolutionRoot)')) - $(SolutionRoot)..\..\ - - $(SolutionRoot)..\..\artifacts\bin\Microsoft.NET.Sdk.Razor\ + + false - $(SolutionRoot)src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.props - $(SolutionRoot)src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.targets + net5.0 - + + + 1.0.0 + OutOfProcess @@ -40,13 +38,14 @@ <_MvcAssemblyName Include="Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib" /> - + + diff --git a/src/Razor/test/testassets/Directory.Build.targets b/src/Razor/test/testassets/Directory.Build.targets index 1c03be36fc..78597554db 100644 --- a/src/Razor/test/testassets/Directory.Build.targets +++ b/src/Razor/test/testassets/Directory.Build.targets @@ -2,7 +2,7 @@ - $(MicrosoftNETCoreApp50PackageVersion) + $(MicrosoftNETCoreAppRuntimeVersion) 99.9 diff --git a/src/Razor/test/testassets/LargeProject/LargeProject.csproj b/src/Razor/test/testassets/LargeProject/LargeProject.csproj index 109a8d32bc..38ee709aec 100644 --- a/src/Razor/test/testassets/LargeProject/LargeProject.csproj +++ b/src/Razor/test/testassets/LargeProject/LargeProject.csproj @@ -1,9 +1,5 @@ - - $(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\ - - - $(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ + $(RepoRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ diff --git a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj index c16ec85c0b..6bb3fcca8d 100644 --- a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj +++ b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj @@ -1,9 +1,5 @@ - - $(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\ - - $(DefaultNetCoreTargetFramework) @@ -20,7 +16,7 @@ - $(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ + $(RepoRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ diff --git a/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj b/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj index 8bebdb3285..2b81a4d5d7 100644 --- a/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj +++ b/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj @@ -1,9 +1,5 @@ - - $(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\ - - true @@ -25,7 +21,7 @@ - $(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ + $(RepoRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ diff --git a/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj b/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj index a83ad7086e..f5d0455baf 100644 --- a/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj +++ b/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj @@ -1,8 +1,4 @@ - - - $(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\ - true @@ -26,7 +22,7 @@ - $(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ + $(RepoRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ diff --git a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj index 5a395f6802..999e94839f 100644 --- a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj +++ b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj @@ -1,9 +1,5 @@ - - $(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\ - - $(DefaultNetCoreTargetFramework) @@ -20,7 +16,7 @@ - $(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ + $(RepoRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ diff --git a/src/Razor/test/testassets/SimpleMvc22/SimpleMvc22.csproj b/src/Razor/test/testassets/SimpleMvc22/SimpleMvc22.csproj index d21c831710..bc33eaf98a 100644 --- a/src/Razor/test/testassets/SimpleMvc22/SimpleMvc22.csproj +++ b/src/Razor/test/testassets/SimpleMvc22/SimpleMvc22.csproj @@ -3,9 +3,6 @@ - - $(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\ - netcoreapp2.2 diff --git a/src/Razor/test/testassets/SimpleMvc22NetFx/SimpleMvc22NetFx.csproj b/src/Razor/test/testassets/SimpleMvc22NetFx/SimpleMvc22NetFx.csproj index ba2f97732b..7d3173f32d 100644 --- a/src/Razor/test/testassets/SimpleMvc22NetFx/SimpleMvc22NetFx.csproj +++ b/src/Razor/test/testassets/SimpleMvc22NetFx/SimpleMvc22NetFx.csproj @@ -3,9 +3,6 @@ - - $(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\ - net461 diff --git a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj index ef683132a5..c4d3fba399 100644 --- a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj +++ b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj @@ -1,9 +1,5 @@  - - $(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\ - - $(DefaultNetCoreTargetFramework) @@ -25,7 +21,7 @@ - $(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ + $(RepoRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ diff --git a/src/Razor/test/testassets/SimplePages/SimplePages.csproj b/src/Razor/test/testassets/SimplePages/SimplePages.csproj index 5a395f6802..999e94839f 100644 --- a/src/Razor/test/testassets/SimplePages/SimplePages.csproj +++ b/src/Razor/test/testassets/SimplePages/SimplePages.csproj @@ -1,9 +1,5 @@ - - $(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\ - - $(DefaultNetCoreTargetFramework) @@ -20,7 +16,7 @@ - $(RepositoryRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\ + $(RepoRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\