diff --git a/Restore.cmd b/Restore.cmd
index eb6060373b0db17a2ab2272b6b3d0e2533159c3c..dba478a78eea3909934d133fdde8595d208ba8dd 100644
--- a/Restore.cmd
+++ b/Restore.cmd
@@ -38,12 +38,6 @@ call "%NugetExe%" restore "%RoslynRoot%build\ToolsetPackages\project.json" %NuGe
echo Restoring packages: Toolsets (Dev14 VS SDK build tools)
call "%NugetExe%" restore "%RoslynRoot%build\ToolsetPackages\dev14.project.json" %NuGetAdditionalCommandLineArgs% || goto :RestoreFailed
-echo Restoring packages: Toolsets (Dev15 VS SDK build tools)
-call "%NugetExe%" restore "%RoslynRoot%build\ToolsetPackages\dev15.project.json" %NuGetAdditionalCommandLineArgs% || goto :RestoreFailed
-
-echo Restoring packages: Toolsets (Dev15 VS SDK 'Willow' build tools)
-call "%NugetExe%" restore "%RoslynRoot%build\ToolsetPackages\dev15Willow.project.json" %NuGetAdditionalCommandLineArgs% || goto :RestoreFailed
-
echo Restoring packages: Toolsets (Dev15 VS SDK RC build tools)
call "%NugetExe%" restore "%RoslynRoot%build\ToolsetPackages\dev15rc.project.json" %NuGetAdditionalCommandLineArgs% || goto :RestoreFailed
diff --git a/build/Targets/Imports.targets b/build/Targets/Imports.targets
index 9f9a468b2f96261f116059ce5b71645e7a9fd4ed..9136231730e77f1648b3ae5262e6de4e2e69d517 100644
--- a/build/Targets/Imports.targets
+++ b/build/Targets/Imports.targets
@@ -290,30 +290,6 @@
-
-
-
-
-
-
-
- <_TempNoneForReordering Include="@(None)" />
-
-
-
-
-
-
diff --git a/build/Targets/Settings.props b/build/Targets/Settings.props
index 2454ef251db9051098cda26d671acc62eb24222d..168108294b0ac9cb2a9b0e56da4345c111cd939b 100644
--- a/build/Targets/Settings.props
+++ b/build/Targets/Settings.props
@@ -54,15 +54,15 @@
pdbonly
true
-
- true
- true
- false
- false
+
true
true
+ false
+ 15.0.25907-RC2
+
+
+ 14.3.25420
@@ -180,30 +180,6 @@
-
-
-
-
- 15.0.25201-dev15preview2
-
-
-
-
- 15.0.25825-RC
-
-
-
-
- 15.0.25604-Preview4
-
-
-
-
- 14.3.25420
-
-
-
-
<_ExplicitReference Include="$(FrameworkPathOverride)\mscorlib.dll" />
diff --git a/build/Targets/TransformVsixManifest.xslt b/build/Targets/TransformVsixManifest.xslt
deleted file mode 100644
index 9e526acdf43b574b208453411cf5c0639ac25a80..0000000000000000000000000000000000000000
--- a/build/Targets/TransformVsixManifest.xslt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/build/ToolsetPackages/dev15.project.json b/build/ToolsetPackages/dev15.project.json
deleted file mode 100644
index 8216ea3d1dc3d3850561e95d9b393f0b06f2d783..0000000000000000000000000000000000000000
--- a/build/ToolsetPackages/dev15.project.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "dependencies": {
- "Microsoft.VSSDK.BuildTools": "15.0.25201-dev15preview2"
- },
- "frameworks": {
- "net46": {}
- }
-}
-
diff --git a/build/ToolsetPackages/dev15Willow.project.json b/build/ToolsetPackages/dev15Willow.project.json
deleted file mode 100644
index e7b5d99c8fba472a847e79fcd2d1847176abb025..0000000000000000000000000000000000000000
--- a/build/ToolsetPackages/dev15Willow.project.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "dependencies": {
- "Microsoft.VSSDK.BuildTools": "15.0.25604-Preview4"
- },
- "frameworks": {
- "net46": {}
- }
-}
-
diff --git a/build/ToolsetPackages/dev15rc.project.json b/build/ToolsetPackages/dev15rc.project.json
index 2a04cdcc551cf614748de41df3ff42ff5089c505..13f49c242bbbb0f948f84a974142ca5ad12edbf1 100644
--- a/build/ToolsetPackages/dev15rc.project.json
+++ b/build/ToolsetPackages/dev15rc.project.json
@@ -1,6 +1,6 @@
{
"dependencies": {
- "Microsoft.VSSDK.BuildTools": "15.0.25825-RC"
+ "Microsoft.VSSDK.BuildTools": "15.0.25907-RC2"
},
"frameworks": {
"net46": {}
diff --git a/build/config/RepoUtilData.json b/build/config/RepoUtilData.json
index a669c933ee5fdfd3c45a9dc3a1636ec1888e0b8c..2243f893802d26544604907c425dbdf4139fc805 100644
--- a/build/config/RepoUtilData.json
+++ b/build/config/RepoUtilData.json
@@ -1,15 +1,15 @@
{
"fixedPackages": {
"Microsoft.VisualStudio.Language.Intellisense": "14.3.25407",
- "Microsoft.VSSDK.BuildTools": [ "14.3.25420", "15.0.25201-dev15preview2","15.0.25604-Preview4", "15.0.25825-RC" ],
+ "Microsoft.VSSDK.BuildTools": [ "14.3.25420", "15.0.25907-RC2" ],
"System.Reflection.Metadata": "1.0.21",
"System.Collections.Immutable": "1.1.36",
- "Microsoft.VisualStudio.Editor": [ "14.3.25407", "15.0.25604-Preview4" ],
- "Microsoft.VisualStudio.Imaging": [ "14.3.25407", "15.0.25604-Preview4" ],
- "Microsoft.VisualStudio.ImageCatalog": [ "14.3.25407", "15.0.25604-Preview4" ],
- "Microsoft.VisualStudio.Text.UI.Wpf": [ "14.3.25407", "15.0.25604-Preview4" ],
- "Microsoft.VisualStudio.Text.Logic": [ "14.3.25407", "15.0.25604-Preview4" ],
- "Microsoft.VisualStudio.Text.Data": [ "14.3.25407", "15.0.25604-Preview4" ],
+ "Microsoft.VisualStudio.Editor": [ "14.3.25407", "15.0.25726-Preview5" ],
+ "Microsoft.VisualStudio.Imaging": [ "14.3.25407", "15.0.25726-Preview5" ],
+ "Microsoft.VisualStudio.ImageCatalog": [ "14.3.25407", "15.0.25726-Preview5" ],
+ "Microsoft.VisualStudio.Text.UI.Wpf": [ "14.3.25407", "15.0.25726-Preview5" ],
+ "Microsoft.VisualStudio.Text.Logic": [ "14.3.25407", "15.0.25726-Preview5" ],
+ "Microsoft.VisualStudio.Text.Data": [ "14.3.25407", "15.0.25726-Preview5" ],
"Microsoft.VisualStudio.Text.UI": "14.3.25407",
"Microsoft.Build": {
"generateName": "Microsoft.Build.14",
diff --git a/src/EditorFeatures/Next/project.json b/src/EditorFeatures/Next/project.json
index ceab3797d7fec5f46b3b79c8939acd38600e297d..4811ac212e3c3ea7339fb2bd1af0fdec86007ec5 100644
--- a/src/EditorFeatures/Next/project.json
+++ b/src/EditorFeatures/Next/project.json
@@ -1,6 +1,16 @@
{
"dependencies": {
- "Dev15BinariesForRoslyn": "5.0.0.0",
+ "Microsoft.VisualStudio.Imaging": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Utilities": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.ImageCatalog": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Text.UI": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.CoreUtility": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Language.Intellisense": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Text.Data": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Text.Logic": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Editor": "15.0.25726-Preview5",
+ "Roslyn.Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.25726-Preview5",
"System.Collections.Immutable": "1.2.0",
"Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime": {
"version": "14.3.25407",
diff --git a/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb b/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
index 95e6a03ea01ea564873adb715612eb8d215c5a41..ed7e5332c589a816ec3c902a443c22a148d7917a 100644
--- a/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
+++ b/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
@@ -932,6 +932,11 @@ Public Class BuildDevDivInsertionFiles
Continue For
End If
+ ' Files generated by the VSIX v3 installer that don't need to be inserted.
+ If partFileName = "catalog.json" OrElse partFileName = "manifest.json" Then
+ Continue For
+ End If
+
If dependencies.ContainsKey(partFileName) Then
Continue For
End If
diff --git a/src/Tools/BuildBoss/StructuredLoggerCheckerUtil.cs b/src/Tools/BuildBoss/StructuredLoggerCheckerUtil.cs
index b953058533003491a1cb10fee3738cb3fe8b5f5e..637a9819002c8695fb947c53be2fb691d2bfe196 100644
--- a/src/Tools/BuildBoss/StructuredLoggerCheckerUtil.cs
+++ b/src/Tools/BuildBoss/StructuredLoggerCheckerUtil.cs
@@ -94,11 +94,6 @@ private void ProcessCopyingFileFrom(string text, string prefix, string infix)
var source = text.Substring(prefixLength, split - prefixLength);
var destination = text.Substring(split + toLength, text.Length - 2 - split - toLength);
- if (IgnoreDestinationTemporarily(destination))
- {
- return;
- }
-
List list;
if (!_copyMap.TryGetValue(destination, out list))
{
@@ -108,41 +103,5 @@ private void ProcessCopyingFileFrom(string text, string prefix, string infix)
list.Add(source);
}
-
- ///
- /// Presently our build has a series of bad double writes. Until we have completely fixed these
- /// scenarios we will suppress the error.
- ///
- /// https://github.com/dotnet/roslyn/issues/15163
- ///
- private static bool IgnoreDestinationTemporarily(string destinationPath)
- {
- var fileName = Path.GetFileName(destinationPath);
- var parentDirName = Path.GetFileName(Path.GetDirectoryName(destinationPath));
- if (FilePathComparer.Equals(parentDirName, "VisualStudioTest.Next"))
- {
- return
- FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.CoreUtility.dll") ||
- FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Language.Intellisense.dll") ||
- FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Text.Data.dll") ||
- FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Text.Logic.dll") ||
- FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Text.UI.dll") ||
- FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Text.UI.Wpf.dll");
- }
-
- if (FilePathComparer.Equals(parentDirName, "VisualStudioSetup.Next"))
- {
- return
- FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.CoreUtility.dll") ||
- FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Shell.15.0.dll") ||
- FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Shell.Framework.dll") ||
- FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Text.Data.dll") ||
- FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Text.Logic.dll") ||
- FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Text.UI.dll") ||
- FilePathComparer.Equals(fileName, "Microsoft.VisualStudio.Text.UI.Wpf.dll");
- }
-
- return false;
- }
}
}
diff --git a/src/VisualStudio/Core/Next/project.json b/src/VisualStudio/Core/Next/project.json
index 671695a7c20628d1a7f99b200a8acb25e3306b7f..597fff63db098f59daf12042c641b0ee9f6ac7d7 100644
--- a/src/VisualStudio/Core/Next/project.json
+++ b/src/VisualStudio/Core/Next/project.json
@@ -1,7 +1,18 @@
{
"dependencies": {
- "Dev15BinariesForRoslyn": "5.0.0.0",
- "Microsoft.VisualStudio.ImageCatalog": "15.0.25604-Preview4",
+ "Microsoft.VisualStudio.Imaging": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Utilities": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.ImageCatalog": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Text.UI": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.CoreUtility": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Language.Intellisense": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Text.Data": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Text.Logic": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Editor": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Shell.Framework": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Shell.15.0": "15.0.25726-Preview5",
+ "Roslyn.Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.25726-Preview5",
"NuGet.VisualStudio": {
"version": "3.3.0",
"suppressParent": "all"
diff --git a/src/VisualStudio/Core/Test.Next/project.json b/src/VisualStudio/Core/Test.Next/project.json
index a16ff4967f5e8b784961afc9277ff4d79ebdc486..e381f570c51e0ab50a1ae3dec12fa38e00665d4d 100644
--- a/src/VisualStudio/Core/Test.Next/project.json
+++ b/src/VisualStudio/Core/Test.Next/project.json
@@ -3,17 +3,19 @@
"Newtonsoft.Json": "8.0.3",
"Moq": "4.2.1402.2112",
"Microsoft.VisualStudio.Composition": "14.2.19-pre",
- "Dev15BinariesForRoslyn": "5.0.0.0",
- "Microsoft.VisualStudio.Imaging": "15.0.25604-Preview4",
- "Microsoft.VisualStudio.Utilities": "15.0.25604-Preview4",
- "Microsoft.VisualStudio.ImageCatalog": "15.0.25604-Preview4",
- "Microsoft.VisualStudio.Text.UI": "15.0.25604-Preview4",
- "Microsoft.VisualStudio.CoreUtility": "15.0.25604-Preview4",
- "Microsoft.VisualStudio.Language.Intellisense": "15.0.25604-Preview4",
- "Microsoft.VisualStudio.Text.Data": "15.0.25604-Preview4",
- "Microsoft.VisualStudio.Text.Logic": "15.0.25604-Preview4",
- "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.25604-Preview4",
- "Microsoft.VisualStudio.Editor": "15.0.25604-Preview4",
+ "Microsoft.VisualStudio.Imaging": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Utilities": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.ImageCatalog": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Text.UI": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.CoreUtility": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Language.Intellisense": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Text.Data": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Text.Logic": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Editor": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Shell.Framework": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Shell.15.0": "15.0.25726-Preview5",
+ "Roslyn.Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.25726-Preview5",
},
"frameworks": {
"net46": { }
diff --git a/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj b/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj
index a7764bb7e2bf547a1496057ceb655775381fdd79..3aefe9dc920a9fa71273d4cf7ba56cd7341244dd 100644
--- a/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj
+++ b/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj
@@ -14,7 +14,12 @@
false
false
$(VisualStudioVersion)
- true
+
+
+ true
v4.6
true
false
@@ -107,4 +112,4 @@
-
\ No newline at end of file
+
diff --git a/src/VisualStudio/Setup.Next/project.json b/src/VisualStudio/Setup.Next/project.json
index 71c1c5c466f2d314bdbaddf45d2cf71b717418ff..2e755319cdb7c96565f14c27a7c7439743ded32b 100644
--- a/src/VisualStudio/Setup.Next/project.json
+++ b/src/VisualStudio/Setup.Next/project.json
@@ -1,5 +1,9 @@
{
"dependencies": {
+ "Microsoft.VisualStudio.Shell.Framework": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Shell.15.0": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Shell.Immutable.10.0": "15.0.25413-Preview5",
+ "Microsoft.VisualStudio.Shell.Immutable.11.0": "15.0.25413-Preview5",
"RoslynDependencies.Microsoft.VisualStudio.CallHierarchy.Package.Definitions": {
"version": "14.3.25407",
"suppressParent": "all"
@@ -11,4 +15,4 @@
"runtimes": {
"win7": { }
}
-}
\ No newline at end of file
+}
diff --git a/src/VisualStudio/Xaml/Impl/project.json b/src/VisualStudio/Xaml/Impl/project.json
index c2ca2d2552279ec23a1865d5d080014e1cbadfdb..d99d69a324296f8fa2257367fc3aa5b2224ecb7d 100644
--- a/src/VisualStudio/Xaml/Impl/project.json
+++ b/src/VisualStudio/Xaml/Impl/project.json
@@ -1,10 +1,10 @@
{
"dependencies": {
- "Microsoft.VisualStudio.Editor": "15.0.25604-Preview4",
- "Microsoft.VisualStudio.ImageCatalog": "15.0.25604-Preview4",
- "Microsoft.VisualStudio.Shell.15.0": "15.0.25604-Preview4"
+ "Microsoft.VisualStudio.Editor": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.ImageCatalog": "15.0.25726-Preview5",
+ "Microsoft.VisualStudio.Shell.15.0": "15.0.25726-Preview5"
},
"frameworks": {
"net46": { }
}
-}
\ No newline at end of file
+}