From 8a58a749566788cc7e828daf8b39e35b247fa117 Mon Sep 17 00:00:00 2001 From: Jared Parsons Date: Sat, 6 Apr 2024 15:21:46 -0700 Subject: [PATCH] Revert "Revert "Move to Central Package Management"" (#10235) * Revert "Revert "Move to Central Package Management (#10215)" (#10227)" This reverts commit d7dd4362430dab37e07408195c76a105b08f1cc0. * CPM fix 1 --- Directory.Build.props | 1 + Directory.Packages.props | 126 ++++++++++++++++++ eng/InternalTools.props | 9 ++ eng/Version.Details.xml | 4 + eng/Versions.props | 98 ++------------ eng/restore-internal-tools.yml | 34 +++-- src/Analyzers/Directory.Build.props | 6 +- .../Razor.Diagnostics.Analyzers.Test.csproj | 6 +- .../Razor.Diagnostics.Analyzers.csproj | 2 +- src/Compiler/Directory.Packages.props | 50 +++---- ...vc.Razor.Extensions.Version1_X.Test.csproj | 4 +- ...vc.Razor.Extensions.Version2_X.Test.csproj | 4 +- ...spNetCore.Mvc.Razor.Extensions.Test.csproj | 4 +- .../Microsoft.CodeAnalysis.Razor.Test.csproj | 4 +- ...ore.Razor.Microbenchmarks.Generator.csproj | 2 +- ...NET.Sdk.Razor.SourceGenerators.Test.csproj | 2 +- src/Razor/Directory.Build.props | 6 +- ...ft.AspNetCore.Razor.Microbenchmarks.csproj | 10 +- ...e.Razor.ExternalAccess.LegacyEditor.csproj | 4 +- ...azor.ExternalAccess.RoslynWorkspace.csproj | 8 +- ...oft.AspNetCore.Razor.LanguageServer.csproj | 10 +- ....AspNetCore.Razor.ProjectEngineHost.csproj | 8 +- ...osoft.CodeAnalysis.Razor.Workspaces.csproj | 14 +- ...Microsoft.CodeAnalysis.Remote.Razor.csproj | 12 +- ...Microsoft.VisualStudio.DevKit.Razor.csproj | 4 +- ...Microsoft.VisualStudio.Editor.Razor.csproj | 20 +-- ...io.LanguageServer.ContainedLanguage.csproj | 10 +- ...alStudio.LanguageServerClient.Razor.csproj | 10 +- ...VisualStudio.LanguageServices.Razor.csproj | 20 +-- ...lStudio.RazorExtension.Dependencies.csproj | 24 ++-- ...crosoft.VisualStudio.RazorExtension.csproj | 8 +- .../RazorDeployment/RazorDeployment.csproj | 2 +- src/Razor/src/rzls/rzls.csproj | 4 +- ...spNetCore.Razor.LanguageServer.Test.csproj | 18 +-- .../RazorToolingIntegrationTestBase.cs | 1 + ...spNetCore.Razor.Test.Common.Tooling.csproj | 38 +++--- ...NetCore.Razor.Test.MvcShim.ClassLib.csproj | 4 +- ...tCore.Razor.Test.MvcShim.Version1_X.csproj | 4 +- ...tCore.Razor.Test.MvcShim.Version2_X.csproj | 4 +- ...osoft.AspNetCore.Razor.Test.MvcShim.csproj | 4 +- ...soft.VisualStudio.Editor.Razor.Test.csproj | 1 + ...VisualStudio.Razor.IntegrationTests.csproj | 16 +-- src/Shared/Directory.Build.props | 6 +- .../Language/TestFile.cs | 2 +- ...rosoft.AspNetCore.Razor.Test.Common.csproj | 18 +-- ...NetCore.Razor.Utilities.Shared.Test.csproj | 2 +- ...t.AspNetCore.Razor.Utilities.Shared.csproj | 4 +- 47 files changed, 364 insertions(+), 288 deletions(-) create mode 100644 Directory.Packages.props create mode 100644 eng/InternalTools.props diff --git a/Directory.Build.props b/Directory.Build.props index e5fa856ac0..e86ccf52b7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -25,6 +25,7 @@ true $(MSBuildThisFileDirectory) true + true $(MSBuildThisFileDirectory)src\Shared\ diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000000..0d7c56f88c --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,126 @@ + + + + + <_MicrosoftWebToolsPackageVersion>17.9.67-preview-0001 + <_MicrosoftVisualStudioShellPackagesVersion>17.9.36524 + <_MicrosoftVisualStudioPackagesVersion>17.10.29-preview + <_VisualStudioLanguageServerProtocolVersion>17.10.13-preview + <_MicrosoftExtensionsPackageVersion>6.0.0 + <_BenchmarkDotNetPackageVersion>0.13.5.2136 + <_MicrosoftVisualStudioExtensibilityTestingVersion>0.1.169-beta + <_MicrosoftCodeAnalysisAnalyzersPackageVersion>3.11.0-beta1.24170.2 + <_MicrosoftVisualStudioLanguageServicesPackageVersion>$(MicrosoftVisualStudioLanguageServicesPackageVersion) + <_XunitPackageVersion>2.6.3 + <_MicrosoftBuildPackageVersion>17.3.0-preview-22364-05 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/InternalTools.props b/eng/InternalTools.props new file mode 100644 index 0000000000..67bfdc07e6 --- /dev/null +++ b/eng/InternalTools.props @@ -0,0 +1,9 @@ + + + + + $(RestoreSources); + https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json + + + \ No newline at end of file diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b154e1041..ca742b9e49 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -127,5 +127,9 @@ https://github.com/dotnet/runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 + + https://github.com/dotnet/runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + diff --git a/eng/Versions.props b/eng/Versions.props index 5c37545e46..3c5ae7290f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,6 +78,7 @@ --> 8.0.0 8.0.0 + 8.0.0 - - 17.9.67-preview-0001 - 17.9.36524 - 17.10.29-preview - 17.10.13-preview - 0.2.28-beta - 6.0.0 - 8.0.0 - 6.0.0 - 6.0.0 - 6.0.0 - 4.3.2 - 5.0.0-preview.4.20205.1 - 0.13.5.2136 - 1.2.6 - 16.8.0 - 2.0.0 6.0.0-alpha.1.21072.5 - + + $(MicrosoftNetCompilersToolsetPackageVersion) - 1.1.2-beta1.24121.1 - 1.1.2-beta1.24121.1 - 1.1.2-beta1.24121.1 - $(MicrosoftVisualStudioPackagesVersion) - 0.1.169-beta - $(MicrosoftVisualStudioExtensibilityTestingXunitVersion) - $(MicrosoftVisualStudioPackagesVersion) - $(MicrosoftVisualStudioPackagesVersion) - - - 17.10.16-preview - $(VisualStudioLanguageServerProtocolVersion) - $(VisualStudioLanguageServerProtocolVersion) - $(VisualStudioLanguageServerProtocolVersion) - 0.3.1074 - 17.7.294-pre - $(MicrosoftVisualStudioShellPackagesVersion) - $(MicrosoftVisualStudioShellPackagesVersion) - $(MicrosoftVisualStudioShellPackagesVersion) - $(MicrosoftVisualStudioShellPackagesVersion) - 17.10.3-preview - 17.9.102 - $(MicrosoftVisualStudioPackagesVersion) - $(MicrosoftVisualStudioPackagesVersion) - $(MicrosoftVisualStudioPackagesVersion) - 17.10.12-preview - 16.10.0-preview-1-31008-014 - 17.8.8 - 17.9.132-preview - $(Tooling_HtmlEditorPackageVersion) - $(Tooling_HtmlEditorPackageVersion) - $(Tooling_HtmlEditorPackageVersion) - $(Tooling_HtmlEditorPackageVersion) - $(Tooling_HtmlEditorPackageVersion) - 4.16.0 - 2.5.108 - 13.0.3 - 2.10.69 - 4.8.0 - 2.17.11 - 4.3.0 - 4.5.4 - 3.11.0-beta1.24170.2 - $(Tooling_MicrosoftCodeAnalysisAnalyzersPackageVersion) - $(Tooling_MicrosoftCodeAnalysisAnalyzersPackageVersion) - $(MicrosoftVisualStudioLanguageServicesPackageVersion) + 2.6.3 1.7.0 - 1.5.25 - 1.2.46-alpha - 2.6.3 - $(XunitVersion) - - $(MicrosoftVisualStudioShellPackagesVersion) - 6.0.0 - - 1.7.2 - 6.7.0 - 8.0.0 - 1.4.1 - 17.3.0-preview-22364-05 - $(MicrosoftBuildVersion) - $(MicrosoftBuildVersion) - 4.7.0 - 1.0.0-20230414.1 - 6.0.0 - 6.0.0-preview.7.21377.19 - 13.0.3 - 6.0.0 - 5.0.0 - 6.0.0 - 6.0.0 - - 7.0.0-preview.5.22528.1 + diff --git a/eng/restore-internal-tools.yml b/eng/restore-internal-tools.yml index 57a2606523..50e4fcf398 100644 --- a/eng/restore-internal-tools.yml +++ b/eng/restore-internal-tools.yml @@ -1,14 +1,32 @@ steps: - task: NuGetAuthenticate@1 inputs: - nuGetServiceConnections: 'devdiv/dotnet-core-internal-tooling' + nuGetServiceConnections: devdiv/dotnet-core-internal-tooling, devdiv/engineering forceReinstallCredentialProvider: true - - script: $(Build.SourcesDirectory)/eng/CIBuild.cmd - -restore - -projects $(Build.SourcesDirectory)/eng/common/internal/Tools.csproj - /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/RestoreInternal.binlog - /v:normal - displayName: Restore internal tools - condition: and(succeeded(), ne(variables['_skipRestoreInternalTools'], 'true')) + # Needed for SBOM tool + - task: UseDotNet@2 + displayName: 'Use .NET Core 3.1 runtime' + inputs: + packageType: runtime + version: 3.1.28 + installationPath: '$(Build.SourcesDirectory)\.dotnet' + + # Needed because the build fails the NuGet Tools restore without it + - task: UseDotNet@2 + displayName: 'Use .NET Core sdk' + inputs: + packageType: sdk + useGlobalJson: true + workingDirectory: '$(Build.SourcesDirectory)' + + # Needed to restore the Microsoft.DevDiv.Optimization.Data.PowerShell package + - task: NuGetCommand@2 + displayName: Restore internal tools + inputs: + command: restore + feedsToUse: config + restoreSolution: 'eng\common\internal\Tools.csproj' + nugetConfigPath: 'NuGet.config' + restoreDirectory: '$(Build.SourcesDirectory)\.packages' diff --git a/src/Analyzers/Directory.Build.props b/src/Analyzers/Directory.Build.props index 92ca777a2b..6bcdb3f985 100644 --- a/src/Analyzers/Directory.Build.props +++ b/src/Analyzers/Directory.Build.props @@ -15,9 +15,9 @@ - - - + + + diff --git a/src/Analyzers/Razor.Diagnostics.Analyzers.Test/Razor.Diagnostics.Analyzers.Test.csproj b/src/Analyzers/Razor.Diagnostics.Analyzers.Test/Razor.Diagnostics.Analyzers.Test.csproj index 607502ceba..d8977ed8c0 100644 --- a/src/Analyzers/Razor.Diagnostics.Analyzers.Test/Razor.Diagnostics.Analyzers.Test.csproj +++ b/src/Analyzers/Razor.Diagnostics.Analyzers.Test/Razor.Diagnostics.Analyzers.Test.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/src/Analyzers/Razor.Diagnostics.Analyzers/Razor.Diagnostics.Analyzers.csproj b/src/Analyzers/Razor.Diagnostics.Analyzers/Razor.Diagnostics.Analyzers.csproj index 8963e92678..44ae5fb263 100644 --- a/src/Analyzers/Razor.Diagnostics.Analyzers/Razor.Diagnostics.Analyzers.csproj +++ b/src/Analyzers/Razor.Diagnostics.Analyzers/Razor.Diagnostics.Analyzers.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Compiler/Directory.Packages.props b/src/Compiler/Directory.Packages.props index 13989f1c69..7154276a07 100644 --- a/src/Compiler/Directory.Packages.props +++ b/src/Compiler/Directory.Packages.props @@ -1,35 +1,23 @@  + + <_RoslynPackageVersion>4.9.2 + <_RoslynPackageVersion Condition="'$(DotNetBuildFromSource)' == 'true'">$(MicrosoftCodeAnalysisCommonPackageVersion) + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj index 00a2bd3cf3..9e8954ccee 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj @@ -20,7 +20,9 @@ - + + + diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj index 8a83c589d6..4a45f81e63 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj @@ -20,7 +20,9 @@ - + + + diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj index 791591998e..6698652672 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj @@ -20,7 +20,9 @@ - + + + diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj b/src/Compiler/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj index ed32833d5b..fede476e87 100644 --- a/src/Compiler/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj +++ b/src/Compiler/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj @@ -16,12 +16,14 @@ + + + - diff --git a/src/Compiler/perf/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator.csproj b/src/Compiler/perf/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator.csproj index c4a50fd31a..ae560b9eec 100644 --- a/src/Compiler/perf/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator.csproj +++ b/src/Compiler/perf/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator.csproj @@ -33,7 +33,7 @@ - + diff --git a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/Microsoft.NET.Sdk.Razor.SourceGenerators.Test.csproj b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/Microsoft.NET.Sdk.Razor.SourceGenerators.Test.csproj index f0b8819aa7..15ec36e039 100644 --- a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/Microsoft.NET.Sdk.Razor.SourceGenerators.Test.csproj +++ b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/Microsoft.NET.Sdk.Razor.SourceGenerators.Test.csproj @@ -25,7 +25,7 @@ - + diff --git a/src/Razor/Directory.Build.props b/src/Razor/Directory.Build.props index 75e2a0803a..3d8d65bac3 100644 --- a/src/Razor/Directory.Build.props +++ b/src/Razor/Directory.Build.props @@ -4,9 +4,9 @@ - - - + + + - - - - - + + + + + diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor/Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.csproj b/src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor/Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.csproj index 15d752683d..96d09e7da7 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor/Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.csproj +++ b/src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor/Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj b/src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj index 0fbfa701ca..2205adc617 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj +++ b/src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj @@ -10,10 +10,10 @@ - - - - + + + + diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Microsoft.AspNetCore.Razor.LanguageServer.csproj b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Microsoft.AspNetCore.Razor.LanguageServer.csproj index 41f6b1957c..3f1d2000f3 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Microsoft.AspNetCore.Razor.LanguageServer.csproj +++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Microsoft.AspNetCore.Razor.LanguageServer.csproj @@ -20,17 +20,17 @@ - - - - + + + + - + diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Microsoft.AspNetCore.Razor.ProjectEngineHost.csproj b/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Microsoft.AspNetCore.Razor.ProjectEngineHost.csproj index 6673f340af..df8dd12566 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Microsoft.AspNetCore.Razor.ProjectEngineHost.csproj +++ b/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Microsoft.AspNetCore.Razor.ProjectEngineHost.csproj @@ -12,9 +12,11 @@ - - - + + + + + diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj index 496bff9eab..447bf9fe99 100644 --- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj +++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj @@ -19,13 +19,13 @@ - - - - - - - + + + + + + + diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj index 7d18bccd4c..1c2aef6236 100644 --- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj +++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj @@ -37,12 +37,12 @@ CI builds here: https://github.com/dotnet/razor-tooling/issues/4327 Now we aren't sure why this exposes a "flaky" issue; however, to workaround the break we pin the following packages to workaround the issue. --> - - - - - - + + + + + + diff --git a/src/Razor/src/Microsoft.VisualStudio.DevKit.Razor/Microsoft.VisualStudio.DevKit.Razor.csproj b/src/Razor/src/Microsoft.VisualStudio.DevKit.Razor/Microsoft.VisualStudio.DevKit.Razor.csproj index a5fa1eb056..1147003e47 100644 --- a/src/Razor/src/Microsoft.VisualStudio.DevKit.Razor/Microsoft.VisualStudio.DevKit.Razor.csproj +++ b/src/Razor/src/Microsoft.VisualStudio.DevKit.Razor/Microsoft.VisualStudio.DevKit.Razor.csproj @@ -32,7 +32,9 @@ - + + + diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Microsoft.VisualStudio.Editor.Razor.csproj b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Microsoft.VisualStudio.Editor.Razor.csproj index f2ce7c5ff2..2212e146ec 100644 --- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Microsoft.VisualStudio.Editor.Razor.csproj +++ b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Microsoft.VisualStudio.Editor.Razor.csproj @@ -14,19 +14,19 @@ - - - - - + + + + + - - - + + + - - + + diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServer.ContainedLanguage/Microsoft.VisualStudio.LanguageServer.ContainedLanguage.csproj b/src/Razor/src/Microsoft.VisualStudio.LanguageServer.ContainedLanguage/Microsoft.VisualStudio.LanguageServer.ContainedLanguage.csproj index 362cbfc427..d1f115ab30 100644 --- a/src/Razor/src/Microsoft.VisualStudio.LanguageServer.ContainedLanguage/Microsoft.VisualStudio.LanguageServer.ContainedLanguage.csproj +++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServer.ContainedLanguage/Microsoft.VisualStudio.LanguageServer.ContainedLanguage.csproj @@ -10,11 +10,11 @@ - - - - - + + + + + diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServerClient.Razor/Microsoft.VisualStudio.LanguageServerClient.Razor.csproj b/src/Razor/src/Microsoft.VisualStudio.LanguageServerClient.Razor/Microsoft.VisualStudio.LanguageServerClient.Razor.csproj index 78f3b3afc5..6de5a5e739 100644 --- a/src/Razor/src/Microsoft.VisualStudio.LanguageServerClient.Razor/Microsoft.VisualStudio.LanguageServerClient.Razor.csproj +++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServerClient.Razor/Microsoft.VisualStudio.LanguageServerClient.Razor.csproj @@ -20,18 +20,18 @@ - - - + + + - + - + diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj index a0e9acaf99..d514d2bc3b 100644 --- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj +++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj @@ -15,21 +15,21 @@ - - - - - + + + + + - - + + - + @@ -163,7 +163,7 @@ - + - + \ No newline at end of file diff --git a/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/Microsoft.VisualStudio.RazorExtension.Dependencies.csproj b/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/Microsoft.VisualStudio.RazorExtension.Dependencies.csproj index 6a1c537968..f6fd4df2df 100644 --- a/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/Microsoft.VisualStudio.RazorExtension.Dependencies.csproj +++ b/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/Microsoft.VisualStudio.RazorExtension.Dependencies.csproj @@ -40,14 +40,14 @@ - + - - - + + + @@ -58,14 +58,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj b/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj index a9ceae3b39..b9d40dce98 100644 --- a/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj +++ b/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj @@ -220,16 +220,16 @@ - - - + + + - + diff --git a/src/Razor/src/RazorDeployment/RazorDeployment.csproj b/src/Razor/src/RazorDeployment/RazorDeployment.csproj index c5d5fe69d1..d08fab05df 100644 --- a/src/Razor/src/RazorDeployment/RazorDeployment.csproj +++ b/src/Razor/src/RazorDeployment/RazorDeployment.csproj @@ -11,7 +11,7 @@ RoslynDev - + diff --git a/src/Razor/src/rzls/rzls.csproj b/src/Razor/src/rzls/rzls.csproj index a17a26ec06..03bde5a720 100644 --- a/src/Razor/src/rzls/rzls.csproj +++ b/src/Razor/src/rzls/rzls.csproj @@ -51,8 +51,8 @@ - - + + diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Microsoft.AspNetCore.Razor.LanguageServer.Test.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Microsoft.AspNetCore.Razor.LanguageServer.Test.csproj index 228af87454..4eff150251 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Microsoft.AspNetCore.Razor.LanguageServer.Test.csproj +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Microsoft.AspNetCore.Razor.LanguageServer.Test.csproj @@ -30,15 +30,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Language/IntegrationTests/RazorToolingIntegrationTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Language/IntegrationTests/RazorToolingIntegrationTestBase.cs index c9e3209473..d99ec00e68 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Language/IntegrationTests/RazorToolingIntegrationTestBase.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Language/IntegrationTests/RazorToolingIntegrationTestBase.cs @@ -388,6 +388,7 @@ public class RazorToolingIntegrationTestBase : ToolingTestBase private class CompilationFailedException : XunitException { public CompilationFailedException(Compilation compilation) + :base("Compilation failed") { Compilation = compilation; } diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Microsoft.AspNetCore.Razor.Test.Common.Tooling.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Microsoft.AspNetCore.Razor.Test.Common.Tooling.csproj index e5cf60a2a4..44e68756fd 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Microsoft.AspNetCore.Razor.Test.Common.Tooling.csproj +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Microsoft.AspNetCore.Razor.Test.Common.Tooling.csproj @@ -37,28 +37,28 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + 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 2b68831805..bb80644305 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 @@ -7,8 +7,8 @@ - - + + 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 bcf09b345c..f0137524ae 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 @@ -8,8 +8,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 bcf09b345c..f0137524ae 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 @@ -8,8 +8,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 b9597e7445..7037ea5c64 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 @@ -8,8 +8,8 @@ - - + + diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj index fe20735a98..63aa908abf 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj +++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj @@ -19,6 +19,7 @@ + diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Microsoft.VisualStudio.Razor.IntegrationTests.csproj b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Microsoft.VisualStudio.Razor.IntegrationTests.csproj index 0717d1183b..2a25a3a60e 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Microsoft.VisualStudio.Razor.IntegrationTests.csproj +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Microsoft.VisualStudio.Razor.IntegrationTests.csproj @@ -32,15 +32,13 @@ - - - - - - - - - + + + + + + + diff --git a/src/Shared/Directory.Build.props b/src/Shared/Directory.Build.props index 074da9ecbd..22e7f16332 100644 --- a/src/Shared/Directory.Build.props +++ b/src/Shared/Directory.Build.props @@ -15,9 +15,9 @@ - - - + + + - - - - - - - - - + + + + + + + + + diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.Test/Microsoft.AspNetCore.Razor.Utilities.Shared.Test.csproj b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.Test/Microsoft.AspNetCore.Razor.Utilities.Shared.Test.csproj index b0679cd489..bdcdc4b528 100644 --- a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.Test/Microsoft.AspNetCore.Razor.Utilities.Shared.Test.csproj +++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.Test/Microsoft.AspNetCore.Razor.Utilities.Shared.Test.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj index ba911de8a9..da6be47f37 100644 --- a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj +++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj @@ -12,8 +12,8 @@ - - + +