Updated SDK version and removed the hardcoded version when reading fr…

…om JSON file (#3372)
NuGet · Jun 12, 2020 · 8c69016 · 8c69016
1 parent ebf0ad1
commit 8c69016
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/build/config.props b/build/config.props
@@ -42,9 +42,9 @@
     <!-- when LockSDKVersion is false, it will ignore the properties and just use the latest version for the channel specified in CliVersionForBuilding for building, CliBranchForTesting for testing -->
     <LockSDKVersion>true</LockSDKVersion>
     <OverrideCliBranchForTesting Condition="'$(LockSDKVersion)' == 'false'"></OverrideCliBranchForTesting>
-    <OverrideCliBranchForTesting Condition="'$(LockSDKVersion)' == 'true'">master 5.0.100-alpha1-015516</OverrideCliBranchForTesting>
+    <OverrideCliBranchForTesting Condition="'$(LockSDKVersion)' == 'true'">master</OverrideCliBranchForTesting>
     <CliVersionForBuilding Condition="'$(LockSDKVersion)' == 'false'">master</CliVersionForBuilding>
-    <CliVersionForBuilding Condition="'$(LockSDKVersion)' == 'true'">"master 5.0.100-alpha1-015516"</CliVersionForBuilding> 
+    <CliVersionForBuilding Condition="'$(LockSDKVersion)' == 'true'">"master 5.0.100-preview.3.20216.6"</CliVersionForBuilding> 
     <CliBranchForTesting Condition="'$(OverrideCliBranchForTesting)' != ''">$(OverrideCliBranchForTesting)</CliBranchForTesting>
     <CliBranchForTesting Condition="'$(OverrideCliBranchForTesting)' == ''">master</CliBranchForTesting>
     <CliTargetBranches Condition="'$(OverrideCliTargetBranches)' != ''">$(OverrideCliTargetBranches)</CliTargetBranches>

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
-    "sdk": {
-        "version": "5.0.100-alpha1"
-      }
-}
+  "sdk": {
+    "version": "5.0.100-preview.3.20216.6"
+  }
+}
diff --git a/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/MsbuildIntegrationTestFixture.cs b/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/MsbuildIntegrationTestFixture.cs
@@ -485,7 +485,6 @@ private void CopyNewlyAddedDlls(string[] assemblyNames, string copyFromPath, str
 
         private void PatchDepsJsonWithNewlyAddedDlls(string[] assemblyNames, string[] filePaths)
         {
-            string nugetBuildTasksName = "NuGet.Build.Tasks/5.3.0-rtm.6251";
             foreach (string assemblyName in assemblyNames)
             {
                 foreach (string filePath in filePaths)
@@ -496,7 +495,10 @@ private void PatchDepsJsonWithNewlyAddedDlls(string[] assemblyNames, string[] fi
 
                     JObject netcoreapp50 = targets.GetJObjectProperty<JObject>(".NETCoreApp,Version=v5.0");
 
-                    JObject nugetBuildTasks = netcoreapp50.GetJObjectProperty<JObject>(nugetBuildTasksName);
+                    JProperty nugetBuildTasksProperty = netcoreapp50.Properties().
+                        FirstOrDefault(prop => prop.Name.StartsWith("NuGet.Build.Tasks/", StringComparison.OrdinalIgnoreCase));
+
+                    JObject nugetBuildTasks = nugetBuildTasksProperty.Value.FromJToken<JObject>();
 
                     JObject runtime = nugetBuildTasks.GetJObjectProperty<JObject>("runtime");
 
@@ -512,7 +514,7 @@ private void PatchDepsJsonWithNewlyAddedDlls(string[] assemblyNames, string[] fi
                     );
                     runtime.Add(jproperty);
                     nugetBuildTasks["runtime"] = runtime;
-                    netcoreapp50[nugetBuildTasksName] = nugetBuildTasks;
+                    netcoreapp50[nugetBuildTasksProperty.Name] = nugetBuildTasks;
                     targets[".NETCoreApp,Version=v5.0"] = netcoreapp50;
                     jsonFile["targets"] = targets;
                     SaveJson(jsonFile, filePath);