try to fix

GlitchEnzo · Jan 6, 2023 · 5577ed7 · 5577ed7
1 parent ffd13ad
commit 5577ed7
Show file tree

Hide file tree

Showing 22 changed files with 646 additions and 9 deletions.
diff --git a/Assets/NuGet/Editor/NugetHelper.cs b/Assets/NuGet/Editor/NugetHelper.cs
@@ -572,6 +572,9 @@ private static HashSet<string> GetAlreadyImportedLibs()
                 LogVerbose("Already imported libs: {0}", string.Join(", ", alreadyImportedLibs));
             }
 
+            // workaround not sure way but it reported as missing when not added as NuGet package
+            alreadyImportedLibs.Remove("System.Runtime.CompilerServices.Unsafe");
+
             return alreadyImportedLibs;
         }
 

diff --git a/Assets/NuGet/Editor/NugetPackageAssetPostprocessor.cs b/Assets/NuGet/Editor/NugetPackageAssetPostprocessor.cs
@@ -54,8 +54,12 @@ private static void OnPostprocessAllAssets(string[] importedAssets, string[] del
             }
 
             // project relative nuget restore location with a pending '/'
-            var relativeRepositoryPath = NugetHelper.GetProjectRelativePath(NugetHelper.NugetConfigFile.RepositoryPath).TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar) + Path.DirectorySeparatorChar;
-            var nugetForUnityAssets = importedAssets.Where(path => path.StartsWith(relativeRepositoryPath, StringComparison.OrdinalIgnoreCase) && path.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) && File.Exists(path));
+            var relativeRepositoryPath = NugetHelper.GetProjectRelativePath(NugetHelper.NugetConfigFile.RepositoryPath)
+                .TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar) + Path.DirectorySeparatorChar;
+            var nugetForUnityAssets = importedAssets
+                .Where(path => path.StartsWith(relativeRepositoryPath, StringComparison.OrdinalIgnoreCase) 
+                    && path.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) 
+                    && File.Exists(path));
 
             var results = new List<(string AssetType, string AssetPath, ResultStatus Status)>();
             foreach (var assetPath in nugetForUnityAssets)

diff --git a/Assets/NuGet/Editor/NugetPackageAssetPostprocessor.cs.meta b/Assets/NuGet/Editor/NugetPackageAssetPostprocessor.cs.meta
diff --git a/Assets/NuGet/Editor/NugetWindow.cs b/Assets/NuGet/Editor/NugetWindow.cs
@@ -811,7 +811,7 @@ private void DrawPackage(NugetPackage package, GUIStyle packageStyle, GUIStyle c
                     {
                         GUI.DrawTexture(rect, package.Icon, ScaleMode.StretchToFill);
                     }
-                    else
+                    else if (defaultIcon != null)
                     {
                         GUI.DrawTexture(rect, defaultIcon, ScaleMode.StretchToFill);
                     }

diff --git a/CreateDLL/CreateDLL.csproj b/CreateDLL/CreateDLL.csproj
@@ -6,7 +6,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CreateDLL</RootNamespace>
-    <AssemblyName>NuGetForUnity</AssemblyName>
+    <AssemblyName>NugetForUnity</AssemblyName>
     <TargetFramework>netstandard2.0</TargetFramework>
     <FileAlignment>512</FileAlignment>
     <EnableDefaultItems>false</EnableDefaultItems>

diff --git a/Packager/Assets/NuGet.config b/Packager/Assets/NuGet.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+       <clear/>
+       <add key="NuGet" value="http://www.nuget.org/api/v2/" />
+    </packageSources>
+    <disabledPackageSources />
+    <activePackageSource>
+       <add key="All" value="(Aggregate source)" />
+    </activePackageSource>
+    <config>
+       <add key="repositoryPath" value="./Packages" />
+       <add key="DefaultPushSource" value="http://www.nuget.org/api/v2/" />
+    </config>
+</configuration>
diff --git a/Packager/Assets/NuGet.config.meta b/Packager/Assets/NuGet.config.meta
diff --git a/Packager/Assets/NuGet.meta b/Packager/Assets/NuGet.meta
diff --git a/Packager/Assets/packages.config b/Packager/Assets/packages.config
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages />
diff --git a/Packager/Assets/packages.config.meta b/Packager/Assets/packages.config.meta
diff --git a/TestProjects/ImportAndUseNuGetPackages/.vsconfig b/TestProjects/ImportAndUseNuGetPackages/.vsconfig
@@ -0,0 +1,6 @@
+{
+  "version": "1.0",
+  "components": [
+    "Microsoft.VisualStudio.Workload.ManagedGame"
+  ]
+}
diff --git a/TestProjects/ImportAndUseNuGetPackages/Assets/NuGet.config.meta b/TestProjects/ImportAndUseNuGetPackages/Assets/NuGet.config.meta
diff --git a/TestProjects/ImportAndUseNuGetPackages/Assets/NuGet/Editor.meta b/TestProjects/ImportAndUseNuGetPackages/Assets/NuGet/Editor.meta
diff --git a/TestProjects/ImportAndUseNuGetPackages/Assets/NuGet/Editor/NuGetForUnity.dll.meta b/TestProjects/ImportAndUseNuGetPackages/Assets/NuGet/Editor/NuGetForUnity.dll.meta
diff --git a/TestProjects/ImportAndUseNuGetPackages/Assets/Scripts.meta b/TestProjects/ImportAndUseNuGetPackages/Assets/Scripts.meta
diff --git a/TestProjects/ImportAndUseNuGetPackages/Assets/Scripts/UseSerilog.cs.meta b/TestProjects/ImportAndUseNuGetPackages/Assets/Scripts/UseSerilog.cs.meta
diff --git a/TestProjects/ImportAndUseNuGetPackages/Assets/Scripts/UseSystemTextJson.cs.meta b/TestProjects/ImportAndUseNuGetPackages/Assets/Scripts/UseSystemTextJson.cs.meta
diff --git a/TestProjects/ImportAndUseNuGetPackages/Assets/packages.config b/TestProjects/ImportAndUseNuGetPackages/Assets/packages.config
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-    <package id="Serilog" version="2.12.0" />
-    <package id="System.Text.Json" version="7.0.1" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="7.0.0" />
+  <package id="Serilog" version="2.12.0" />
+  <package id="System.Text.Encodings.Web" version="7.0.0" />
+  <package id="System.Text.Json" version="7.0.1" />
 </packages>
diff --git a/TestProjects/ImportAndUseNuGetPackages/Assets/packages.config.meta b/TestProjects/ImportAndUseNuGetPackages/Assets/packages.config.meta
-Original file line number
+Diff line change
@@ Expand Up @@
                         {
                             GUI.DrawTexture(rect, package.Icon, ScaleMode.StretchToFill);
                         }
-                        else
+                        else if (defaultIcon != null)
                         {
                             GUI.DrawTexture(rect, defaultIcon, ScaleMode.StretchToFill);
                         }
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?xml version="1.0" encoding="utf-8"?>
		<packages />