From ee2a5e6ea46e35a84b204bfedc1bd639c50f96e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Thu, 25 Aug 2016 08:29:17 -0700 Subject: [PATCH] Target FX 4.6 in VS dependency jsons (#13355) --- src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb | 2 +- src/Setup/DevDivPackages/Debugger/project.json | 2 +- src/Setup/DevDivPackages/Roslyn/project.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb b/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb index efd91819f64a7..b68347c47ab8e 100644 --- a/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb +++ b/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb @@ -496,7 +496,7 @@ Public Class BuildDevDivInsertionFiles For Each projectLockJson In Directory.EnumerateFiles(Path.Combine(_setupDirectory, DevDivPackagesDirName), "*.lock.json", SearchOption.AllDirectories) Dim items = JsonConvert.DeserializeObject(File.ReadAllText(projectLockJson)) - Const targetFx = ".NETFramework,Version=v4.6.1/win" + Const targetFx = ".NETFramework,Version=v4.6/win" Dim targetObj = DirectCast(DirectCast(DirectCast(items, JObject).Property("targets")?.Value, JObject).Property(targetFx)?.Value, JObject) If targetObj Is Nothing Then diff --git a/src/Setup/DevDivPackages/Debugger/project.json b/src/Setup/DevDivPackages/Debugger/project.json index 74b9023f034e2..8610271443ef4 100644 --- a/src/Setup/DevDivPackages/Debugger/project.json +++ b/src/Setup/DevDivPackages/Debugger/project.json @@ -12,7 +12,7 @@ "System.Threading.Thread": "4.0.0" }, "frameworks": { - "net461": {} + "net46": {} }, "runtimes": { "win": {} diff --git a/src/Setup/DevDivPackages/Roslyn/project.json b/src/Setup/DevDivPackages/Roslyn/project.json index 7fd4df8001726..4393d3a3e9394 100644 --- a/src/Setup/DevDivPackages/Roslyn/project.json +++ b/src/Setup/DevDivPackages/Roslyn/project.json @@ -13,7 +13,7 @@ "System.IO.FileSystem.Primitives": "4.0.1" }, "frameworks": { - "net461": {} + "net46": {} }, "runtimes": { "win": {}