Skip to content

Remove temp patching for deps.json #3552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
heng-liu wants to merge 3 commits into from
Closed

Remove temp patching for deps.json #3552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ee4c6d
remove temp patching
heng-liu Jul 27, 2020
574befa
rename a property
heng-liu Aug 3, 2020
a35add7
fix after rebase
heng-liu Aug 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/config.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
<!--TODO: remove temporary workaround of using LockSDKVersion. Tracking issue: https://github.com/NuGet/Home/issues/9712 -->
<LockSDKVersion>true</LockSDKVersion>
<OverrideCliBranchForTesting Condition="'$(LockSDKVersion)' == 'false'"></OverrideCliBranchForTesting>
<OverrideCliBranchForTesting Condition="'$(LockSDKVersion)' == 'true'">master 5.0.100-preview.7.20319.6</OverrideCliBranchForTesting>
<CliVersionForBuilding>"master 5.0.100-preview.4.20258.7"</CliVersionForBuilding>
<OverrideCliBranchForTesting Condition="'$(LockSDKVersion)' == 'true'">master 5.0.100-preview.7.20366.6</OverrideCliBranchForTesting>
<CliVersionForBuilding>"master 5.0.100-preview.7.20366.6"</CliVersionForBuilding>
<CliBranchForTesting Condition="'$(OverrideCliBranchForTesting)' != ''">$(OverrideCliBranchForTesting)</CliBranchForTesting>
<CliBranchForTesting Condition="'$(OverrideCliBranchForTesting)' == ''">master</CliBranchForTesting>
<CliTargetBranches Condition="'$(OverrideCliTargetBranches)' != ''">$(OverrideCliTargetBranches)</CliTargetBranches>
Expand Down
7 changes: 3 additions & 4 deletions build/packages.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
<VSFrameworkVersion>16.6.30107.105</VSFrameworkVersion>
<VSServicesVersion>16.153.0</VSServicesVersion>
<VSThreadingVersion>16.7.54</VSThreadingVersion>
<!-- TODO - remove this when temporary patching is no longer necessary. See https://github.com/nuget/home/issues/8952 -->
<PatchedSystemPackagesVersion>5.0.0-preview.3.20214.6</PatchedSystemPackagesVersion>
<CryptographyPackagesVersion>5.0.0-preview.3.20214.6</CryptographyPackagesVersion>
</PropertyGroup>

<!-- Test and package versions -->
Expand Down Expand Up @@ -64,8 +63,8 @@
<PackageReference Update="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
<PackageReference Update="System.Collections.Immutable" Version="1.5.0" />
<PackageReference Update="System.Diagnostics.Debug" Version="$(SystemPackagesVersion)" />
<PackageReference Update="System.Security.Cryptography.Pkcs" Version="$(PatchedSystemPackagesVersion)" />
<PackageReference Update="System.Security.Cryptography.Cng" Version="$(PatchedSystemPackagesVersion)" />
<PackageReference Update="System.Security.Cryptography.Pkcs" Version="$(CryptographyPackagesVersion)" />
<PackageReference Update="System.Security.Cryptography.Cng" Version="$(CryptographyPackagesVersion)" />
<PackageReference Update="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
<PackageReference Update="System.Threading.Tasks.Dataflow" Version="4.9.0" />
<PackageReference Update="VSLangProj" Version="7.0.3300" />
Expand Down
110 changes: 0 additions & 110 deletions test/NuGet.Core.FuncTests/Dotnet.Integration.Test/MsbuildIntegrationTestFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ public MsbuildIntegrationTestFixture()

var sdkPath = Directory.EnumerateDirectories(Path.Combine(_cliDirectory, "sdk")).Single();

// TODO - remove when shipping. See https://github.com/NuGet/Home/issues/8952
PatchSDKWithCryptographyDlls(sdkPath);

MsBuildSdksPath = Path.Combine(sdkPath, "Sdks");

_templateDirectory = new SimpleTestPathContext();
Expand Down Expand Up @@ -608,112 +605,5 @@ private static void DeleteDirectory(string path)

}
}

// Temporary added methods for processing deps.json files for patching

/// <summary>
/// Temporary patching process to bring in Cryptography DLLs for testing while SDK gets around to including them in 5.0.
/// See also: https://github.com/NuGet/Home/issues/8508
/// </summary>
private void PatchSDKWithCryptographyDlls(string sdkPath)
{
var assemblyNames = new string[1] { "System.Security.Cryptography.Pkcs.dll" };
PatchDepsJsonFiles(assemblyNames, sdkPath);

string userProfilePath = Environment.GetEnvironmentVariable(RuntimeEnvironmentHelper.IsWindows ? "USERPROFILE" : "HOME");
string globalPackagesPath = Path.Combine(userProfilePath, ".nuget", "packages");

CopyNewlyAddedDlls(assemblyNames, Directory.GetCurrentDirectory(), sdkPath);
}

private void PatchDepsJsonFiles(string[] assemblyNames, string patchDir)
{
string[] fileNames = new string[3] { "dotnet.deps.json", "MSBuild.deps.json", "NuGet.CommandLine.XPlat.deps.json" };
string[] fullNames = fileNames.Select(filename => Path.Combine(patchDir, filename)).ToArray();
PatchDepsJsonWithNewlyAddedDlls(assemblyNames, fullNames);
}

private void CopyNewlyAddedDlls(string[] assemblyNames, string copyFromPath, string copyToPath)
{
foreach (var assemblyName in assemblyNames)
{
File.Copy(
Path.Combine(copyFromPath, assemblyName),
Path.Combine(copyToPath, assemblyName)
);
}
}

private void PatchDepsJsonWithNewlyAddedDlls(string[] assemblyNames, string[] filePaths)
{
foreach (string assemblyName in assemblyNames)
{
foreach (string filePath in filePaths)
{
JObject jsonFile = GetJson(filePath);

JObject targets = jsonFile.GetJObjectProperty<JObject>("targets");

JObject netcoreapp50 = targets.GetJObjectProperty<JObject>(".NETCoreApp,Version=v5.0");

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");

var assemblyPath = Path.Combine(Directory.GetCurrentDirectory(), assemblyName);
var assemblyVersion = Assembly.LoadFile(assemblyPath).GetName().Version.ToString();
var assemblyFileVersion = FileVersionInfo.GetVersionInfo(assemblyPath).FileVersion;
var jproperty = new JProperty("lib/netcoreapp5.0/" + assemblyName,
new JObject
{
new JProperty("assemblyVersion", assemblyVersion),
new JProperty("fileVersion", assemblyFileVersion),
}
);
runtime.Add(jproperty);
nugetBuildTasks["runtime"] = runtime;
netcoreapp50[nugetBuildTasksProperty.Name] = nugetBuildTasks;
targets[".NETCoreApp,Version=v5.0"] = netcoreapp50;
jsonFile["targets"] = targets;
SaveJson(jsonFile, filePath);
}
}
}

private JObject GetJson(string jsonFilePath)
{
try
{
return FileUtility.SafeRead(jsonFilePath, (stream, filePath) =>
{
using (var reader = new StreamReader(stream))
{
return JObject.Parse(reader.ReadToEnd());
}
});
}
catch (Exception ex)
{
throw new InvalidOperationException(
string.Format("Failed to read json file at {0}: {1}", jsonFilePath, ex.Message),
ex
);
}
}

private void SaveJson(JObject json, string jsonFilePath)
{
FileUtility.Replace((outputPath) =>
{
using (var writer = new StreamWriter(outputPath, append: false, encoding: Encoding.UTF8))
{
writer.Write(json.ToString());
}
},
jsonFilePath);
}
}
}