From ef3378f345d3ea57de5c8f5323723d184541e176 Mon Sep 17 00:00:00 2001
From: Anipik <anirudhagnihotry098@gmail.com>
Date: Wed, 17 Mar 2021 00:15:38 -0700
Subject: [PATCH 1/3] add net472 to package

---
 .../Microsoft.DotNet.PackageValidation.csproj            | 9 ++++++++-
 src/Microsoft.DotNet.PackageValidation/NupkgParser.cs    | 6 +++---
 .../build/Microsoft.DotNet.PackageValidation.props       | 3 ++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj b/src/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
index 0ebe3ccb585..ad2c5a443e6 100644
--- a/src/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
+++ b/src/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
     <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
     <PackageType>MSBuildSdk</PackageType>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IsPackable>true</IsPackable>
+    <DefaultItemExcludes Condition="'$(TargetFramework)' != 'net472'">**/*.Desktop.*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,6 +16,12 @@
     <PackageReference Include="NuGet.Frameworks" Version="$(NuGetVersion)" />
     <PackageReference Include="NuGet.Packaging" Version="$(NuGetVersion)" />
   </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
+    <Compile Include="..\..\Common\Internal\AssemblyResolver.cs" />
+    <Compile Include="..\..\Common\Internal\BuildTask.Desktop.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\Common\Internal\BuildTask.cs" />
   </ItemGroup>
diff --git a/src/Microsoft.DotNet.PackageValidation/NupkgParser.cs b/src/Microsoft.DotNet.PackageValidation/NupkgParser.cs
index 19e2f0049c6..77d73bb0c69 100644
--- a/src/Microsoft.DotNet.PackageValidation/NupkgParser.cs
+++ b/src/Microsoft.DotNet.PackageValidation/NupkgParser.cs
@@ -42,18 +42,18 @@ public static PackageAsset ExtractAssetFromFile(string filePath)
             PackageAsset asset = null;
             if (filePath.StartsWith("ref"))
             {
-                var stringParts = filePath.Split(@"/");
+                var stringParts = filePath.Split('/');
                 asset = new PackageAsset(NuGetFramework.Parse(stringParts[1]), null, filePath, AssetType.RefAsset);
             }
             else if (filePath.StartsWith("lib"))
             {
-                var stringParts = filePath.Split(@"/");
+                var stringParts = filePath.Split('/');
                 asset = new PackageAsset(NuGetFramework.Parse(stringParts[1]), null, filePath, AssetType.LibAsset);
 
             }
             else if (filePath.StartsWith("runtimes"))
             {
-                var stringParts = filePath.Split(@"/");
+                var stringParts = filePath.Split('/');
                 asset = new PackageAsset(NuGetFramework.Parse(stringParts[3]), stringParts[1], filePath, AssetType.RuntimeAsset);
             }
 
diff --git a/src/Microsoft.DotNet.PackageValidation/build/Microsoft.DotNet.PackageValidation.props b/src/Microsoft.DotNet.PackageValidation/build/Microsoft.DotNet.PackageValidation.props
index 2ef430ca642..08703d1bd38 100644
--- a/src/Microsoft.DotNet.PackageValidation/build/Microsoft.DotNet.PackageValidation.props
+++ b/src/Microsoft.DotNet.PackageValidation/build/Microsoft.DotNet.PackageValidation.props
@@ -1,5 +1,6 @@
 <Project>
   <PropertyGroup>
-    <DotNetPackageValidationAssembly>$(MSBuildThisFileDirectory)\..\tools\net5.0\Microsoft.DotNet.PackageValidation.dll</DotNetPackageValidationAssembly>
+    <DotNetPackageValidationAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.PackageValidation.dll</DotNetPackageValidationAssembly>
+    <DotNetPackageValidationAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\netcoreapp3.1\Microsoft.DotNet.PackageValidation.dll</DotNetPackageValidationAssembly>
   </PropertyGroup>
 </Project>

From b33742c724862ad544d67155958480ff15e31991 Mon Sep 17 00:00:00 2001
From: Anirudh Agnihotry <anirudhagnihotry098@gmail.com>
Date: Wed, 17 Mar 2021 07:28:56 -0700
Subject: [PATCH 2/3] correcting the csproj

---
 .../Microsoft.DotNet.PackageValidation.csproj               | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj b/src/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
index ad2c5a443e6..2f35e4aa96f 100644
--- a/src/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
+++ b/src/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
@@ -6,7 +6,6 @@
     <PackageType>MSBuildSdk</PackageType>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IsPackable>true</IsPackable>
-    <DefaultItemExcludes Condition="'$(TargetFramework)' != 'net472'">**/*.Desktop.*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,11 +16,6 @@
     <PackageReference Include="NuGet.Packaging" Version="$(NuGetVersion)" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
-    <Compile Include="..\..\Common\Internal\AssemblyResolver.cs" />
-    <Compile Include="..\..\Common\Internal\BuildTask.Desktop.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Include="..\Common\Internal\BuildTask.cs" />
   </ItemGroup>

From 3adc8334f5301c5c6895b7fe9875f9bf131411a5 Mon Sep 17 00:00:00 2001
From: Anipik <anirudhagnihotry098@gmail.com>
Date: Wed, 17 Mar 2021 10:23:02 -0700
Subject: [PATCH 3/3] add net472 to tests

---
 .../Microsoft.DotNet.PackageValidation.Tests.csproj             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.DotNet.PackageValidation.Tests/Microsoft.DotNet.PackageValidation.Tests.csproj b/src/Microsoft.DotNet.PackageValidation.Tests/Microsoft.DotNet.PackageValidation.Tests.csproj
index 874202d0036..f69b97f4a64 100644
--- a/src/Microsoft.DotNet.PackageValidation.Tests/Microsoft.DotNet.PackageValidation.Tests.csproj
+++ b/src/Microsoft.DotNet.PackageValidation.Tests/Microsoft.DotNet.PackageValidation.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>