diff --git a/.gitignore b/.gitignore
index 8c1db266d3..15217d4a09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,4 +36,3 @@ global.json
BenchmarkDotNet.Artifacts/
Microsoft.VisualStudio.RazorExtension.nuget.props
Microsoft.VisualStudio.RazorExtension.nuget.targets
-korebuild-lock.txt
diff --git a/Directory.Build.props b/Directory.Build.props
index 1db5df8aac..60d2bcd5c5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
-
-
-
+
+
+
Microsoft ASP.NET Core
@@ -10,17 +10,14 @@
$(MSBuildThisFileDirectory)build\Key.snk
true
true
- $(VersionSuffix)-$(BuildNumber)
true
full
-
- 2.6.0-beta1-62023-02
-
+
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 8296c12835..e83ff95e39 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,14 +1,5 @@
-
-
-
- <_BootstrapperFile Condition=" $([MSBuild]::IsOSUnixLike()) ">build.sh
- <_BootstrapperFile Condition="! $([MSBuild]::IsOSUnixLike()) ">build.cmd
- <_BootstrapperError>
- Package references have not been pinned. Run './$(_BootstrapperFile) /t:Pin'.
- Also, you can run './$(_BootstrapperFile) /t:Restore' which will pin *and* restore packages. '$(_BootstrapperFile)' can be found in '$(MSBuildThisFileDirectory)'.
-
-
-
-
-
+
+
+ $(MicrosoftNETCoreApp20PackageVersion)
+
diff --git a/NuGet.config b/NuGet.config
index 9cb41065d8..8e5234a8c0 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -3,6 +3,7 @@
+
diff --git a/README.md b/README.md
index c1c15ad936..e584eaef12 100644
--- a/README.md
+++ b/README.md
@@ -11,9 +11,4 @@ This project is part of ASP.NET Core. You can find samples, documentation and ge
## Building from source
-To run a complete build on command line only, execute `build.cmd` or `build.sh` without arguments.
-
-Before opening this project in Visual Studio or VS Code, execute `build.cmd /t:Restore` (Windows) or `./build.sh /t:Restore` (Linux/macOS).
-This will execute only the part of the build script that downloads and initializes a few required build tools and packages.
-
-See [developer documentation](https://github.com/aspnet/Home/wiki) for more details.
+To run a complete build on command line only, execute `build.cmd` or `build.sh` without arguments. See [developer documentation](https://github.com/aspnet/Home/wiki) for more details.
diff --git a/build/MPack.targets b/build/MPack.targets
index a3dc52749c..303fb57e7c 100644
--- a/build/MPack.targets
+++ b/build/MPack.targets
@@ -1,4 +1,4 @@
-
+
$(PackageDependsOn);GenerateMPack
Microsoft.VisualStudio.Mac.RazorAddin
diff --git a/build/VSIX.targets b/build/VSIX.targets
index 5d871caf94..621ebbe641 100644
--- a/build/VSIX.targets
+++ b/build/VSIX.targets
@@ -1,4 +1,4 @@
-
+
true
$(RestoreDependsOn);RestoreVSIX
diff --git a/build/dependencies.props b/build/dependencies.props
new file mode 100644
index 0000000000..5ef67532fd
--- /dev/null
+++ b/build/dependencies.props
@@ -0,0 +1,50 @@
+
+
+ $(MSBuildAllProjects);$(MSBuildThisFileFullPath)
+
+
+ 0.10.9
+ 2.1.0-preview1-15551
+ 2.1.0-preview1-27498
+ 2.1.0-preview1-27498
+ 2.3.1
+ 2.3.1
+ 2.1.0-preview1-27498
+ 2.0.0
+ 2.1.0-preview1-27498
+ 2.1.0-preview1-27498
+ 2.0.0
+ 15.3.0
+ 15.0.26606
+ 15.0.26606
+ 15.0.26606
+ 7.10.6070
+ 15.0.26606
+ 10.0.30319
+ 11.0.61030
+ 12.0.30110
+ 8.0.50727
+ 9.0.30729
+ 7.10.6071
+ 1.3.7
+ 4.7.49
+ 2.0.0
+ 10.0.1
+ 1.1.92
+ 4.4.1
+ 9.0.1
+ 2.6.0-beta1-62023-02
+ 2.6.0-beta1-62023-02
+ 2.6.0-beta1-62023-02
+ 2.6.0-beta1-62023-02
+ 2.6.0-beta1-62023-02
+ 2.6.0-beta1-62023-02
+ 2.6.0-beta1-62023-02
+ 2.6.0-beta1-62023-02
+ 2.6.0-beta1-62023-02
+ 0.7.0
+ 2.3.0
+ 2.3.0
+
+
+
diff --git a/build/repo.props b/build/repo.props
index a383ca9761..453bb5783c 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -1,4 +1,4 @@
-
+
@@ -8,7 +8,10 @@
-
-
+
+
+ Internal.AspNetCore.Universe.Lineup
+ https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json
+
diff --git a/build/repo.targets b/build/repo.targets
index 7421daef5c..4841052ed6 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -1,4 +1,4 @@
-
+
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
new file mode 100644
index 0000000000..86352477bb
--- /dev/null
+++ b/korebuild-lock.txt
@@ -0,0 +1,2 @@
+version:2.1.0-preview1-15551
+commithash:8fad9553b48533fddbb16a423ea55b9710ea2e63
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 681b3298ac..38e0d15d69 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,5 +1,5 @@
-
-
+
+
$(NoWarn);CS1591
@@ -8,7 +8,7 @@
-
+
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj
index afb11fe610..2935e1b9ca 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj
index 947759e05d..497df54e0f 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/src/Microsoft.AspNetCore.Razor.Language/Microsoft.AspNetCore.Razor.Language.csproj b/src/Microsoft.AspNetCore.Razor.Language/Microsoft.AspNetCore.Razor.Language.csproj
index abbadaa5f1..2cb75415c1 100644
--- a/src/Microsoft.AspNetCore.Razor.Language/Microsoft.AspNetCore.Razor.Language.csproj
+++ b/src/Microsoft.AspNetCore.Razor.Language/Microsoft.AspNetCore.Razor.Language.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/Microsoft.AspNetCore.Razor.Runtime.csproj b/src/Microsoft.AspNetCore.Razor.Runtime/Microsoft.AspNetCore.Razor.Runtime.csproj
index 3a89a208fa..962c97a367 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/Microsoft.AspNetCore.Razor.Runtime.csproj
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/Microsoft.AspNetCore.Razor.Runtime.csproj
@@ -18,9 +18,9 @@ Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper
-
-
-
+
+
+
diff --git a/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj b/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj
index bcdd47bfc5..e7f29a2fb0 100644
--- a/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj
+++ b/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj
@@ -11,8 +11,8 @@
-
-
+
+
diff --git a/src/Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj b/src/Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj
index 79676f791a..3dad5cbe5d 100644
--- a/src/Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj
+++ b/src/Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj b/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj
index 6d666d41e6..7cf58777ef 100644
--- a/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj
+++ b/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj
@@ -17,11 +17,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/Microsoft.VisualStudio.Editor.Razor/Microsoft.VisualStudio.Editor.Razor.csproj b/src/Microsoft.VisualStudio.Editor.Razor/Microsoft.VisualStudio.Editor.Razor.csproj
index 47d1f08da4..32b484f542 100644
--- a/src/Microsoft.VisualStudio.Editor.Razor/Microsoft.VisualStudio.Editor.Razor.csproj
+++ b/src/Microsoft.VisualStudio.Editor.Razor/Microsoft.VisualStudio.Editor.Razor.csproj
@@ -7,9 +7,9 @@
-
-
-
+
+
+
diff --git a/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj b/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj
index c059068d03..bc0f4bcaa8 100644
--- a/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj
+++ b/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj
@@ -11,23 +11,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- KRB4002
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
index 314b701b8c..898c995431 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
@@ -20,13 +20,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -39,7 +39,7 @@
-
+
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
index 72ee2f63c8..275be5e7a2 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
@@ -1,4 +1,4 @@
-
+
netcoreapp2.0;net461
@@ -20,13 +20,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -39,7 +39,7 @@
-
+
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Microsoft.AspNetCore.Razor.Language.Test.csproj b/test/Microsoft.AspNetCore.Razor.Language.Test/Microsoft.AspNetCore.Razor.Language.Test.csproj
index dd85e06b3d..0a1b946c90 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Microsoft.AspNetCore.Razor.Language.Test.csproj
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Microsoft.AspNetCore.Razor.Language.Test.csproj
@@ -17,12 +17,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/test/Microsoft.AspNetCore.Razor.Performance/Microsoft.AspNetCore.Razor.Performance.csproj b/test/Microsoft.AspNetCore.Razor.Performance/Microsoft.AspNetCore.Razor.Performance.csproj
index 1f7f461575..da0a1b14e0 100644
--- a/test/Microsoft.AspNetCore.Razor.Performance/Microsoft.AspNetCore.Razor.Performance.csproj
+++ b/test/Microsoft.AspNetCore.Razor.Performance/Microsoft.AspNetCore.Razor.Performance.csproj
@@ -1,4 +1,4 @@
-
+
netcoreapp2.0
@@ -13,7 +13,7 @@
-
+
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj
index 0d328ce48a..9c8aa14637 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj
@@ -19,12 +19,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj b/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
index eab9835d08..112861c5d1 100644
--- a/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
+++ b/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
@@ -12,10 +12,10 @@
-
-
-
-
+
+
+
+
diff --git a/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj b/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj
index b2630f9d07..d95c75b444 100644
--- a/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj
+++ b/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj
@@ -1,4 +1,4 @@
-
+
net461;netcoreapp2.0
@@ -10,7 +10,7 @@
-
+
diff --git a/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj b/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
index b2630f9d07..d95c75b444 100644
--- a/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
+++ b/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
@@ -1,4 +1,4 @@
-
+
net461;netcoreapp2.0
@@ -10,7 +10,7 @@
-
+
diff --git a/test/Microsoft.CodeAnalysis.Razor.Test/Microsoft.CodeAnalysis.Razor.Test.csproj b/test/Microsoft.CodeAnalysis.Razor.Test/Microsoft.CodeAnalysis.Razor.Test.csproj
index 9975467c2a..70e48f933c 100644
--- a/test/Microsoft.CodeAnalysis.Razor.Test/Microsoft.CodeAnalysis.Razor.Test.csproj
+++ b/test/Microsoft.CodeAnalysis.Razor.Test/Microsoft.CodeAnalysis.Razor.Test.csproj
@@ -21,11 +21,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.csproj b/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.csproj
index 87ba37e5ef..2c7a2f767c 100644
--- a/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.csproj
+++ b/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.csproj
@@ -18,13 +18,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj b/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj
index 3a355769ae..b96e8ac612 100644
--- a/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj
+++ b/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj
@@ -14,10 +14,10 @@
-
-
-
-
+
+
+
+
diff --git a/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj b/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj
index ff43f27f9b..7e010cf2a9 100644
--- a/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj
+++ b/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj
@@ -13,11 +13,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj b/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj
index 61e68a3cb6..d182c95d31 100644
--- a/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj
+++ b/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj
@@ -25,15 +25,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/test/RazorPageGenerator.Test/RazorPageGenerator.Test.csproj b/test/RazorPageGenerator.Test/RazorPageGenerator.Test.csproj
index 53b82a6e87..4ff3c28d2d 100644
--- a/test/RazorPageGenerator.Test/RazorPageGenerator.Test.csproj
+++ b/test/RazorPageGenerator.Test/RazorPageGenerator.Test.csproj
@@ -18,11 +18,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/tooling/Microsoft.VisualStudio.Mac.RazorAddin/AddinMetadata.props b/tooling/Microsoft.VisualStudio.Mac.RazorAddin/AddinMetadata.props
index d31ea391eb..0797744c9a 100644
--- a/tooling/Microsoft.VisualStudio.Mac.RazorAddin/AddinMetadata.props
+++ b/tooling/Microsoft.VisualStudio.Mac.RazorAddin/AddinMetadata.props
@@ -1,8 +1,5 @@
- 7.0
- $(VSForMacVersion).$(BuildNumber)
- $(VSForMacVersion).999999
RazorAddin
Microsoft.VisualStudio.Mac
Razor Language Services
diff --git a/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj b/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj
index c0a81f5f5f..843de6fcad 100644
--- a/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj
+++ b/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj
@@ -1,4 +1,4 @@
-
+
@@ -6,23 +6,23 @@
-
+
<_Parameter1>$(AddinId)
$(AddinNamespace)
$(AddinVersion)
-
-
+
+
<_Parameter1>$(AddinDetailedName)
-
-
+
+
<_Parameter1>$(AddinCategory)
-
-
+
+
<_Parameter1>$(Description)
-
+
<_Parameter1>$(Authors)
-
+
@@ -30,7 +30,7 @@
-
+
diff --git a/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj b/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
index d4ccacaf74..173c65a752 100644
--- a/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
+++ b/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
@@ -291,4 +291,4 @@
-
\ No newline at end of file
+
diff --git a/version.props b/version.props
new file mode 100644
index 0000000000..4f66dee80d
--- /dev/null
+++ b/version.props
@@ -0,0 +1,15 @@
+
+
+ 2.1.0
+ preview1
+ $(VersionPrefix)
+ $(VersionPrefix)-$(VersionSuffix)-final
+ t000
+ $(VersionSuffix)-$(BuildNumber)
+
+
+ 7.0
+ $(VSForMacVersion).$(BuildNumber)
+ $(VSForMacVersion).999999
+
+
diff --git a/version.xml b/version.xml
deleted file mode 100644
index 3c05022b7d..0000000000
--- a/version.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- dev
- 2.1.0
- preview1
-
-