Replace Roslyn Library with Rosyn dlls instead

Eastrall · May 21, 2023 · f08b5a1 · f08b5a1
1 parent 71c7994
commit f08b5a1
Show file tree

Hide file tree

Showing 23 changed files with 302 additions and 30 deletions.
diff --git a/Editor/Plugins/Microsoft.CodeAnalysis.CSharp.dll b/Editor/Plugins/Microsoft.CodeAnalysis.CSharp.dll
diff --git a/...r/Plugins/Rosalina.RoslynLibrary.dll.meta → ...ns/Microsoft.CodeAnalysis.CSharp.dll.meta b/...r/Plugins/Rosalina.RoslynLibrary.dll.meta → ...ns/Microsoft.CodeAnalysis.CSharp.dll.meta
diff --git a/Editor/Plugins/Microsoft.CodeAnalysis.dll b/Editor/Plugins/Microsoft.CodeAnalysis.dll
diff --git a/Editor/Plugins/Microsoft.CodeAnalysis.dll.meta b/Editor/Plugins/Microsoft.CodeAnalysis.dll.meta
diff --git a/Editor/Plugins/Rosalina.RoslynLibrary.dll b/Editor/Plugins/Rosalina.RoslynLibrary.dll
diff --git a/Editor/Plugins/System.Buffers.dll b/Editor/Plugins/System.Buffers.dll
diff --git a/Editor/Plugins/System.Buffers.dll.meta b/Editor/Plugins/System.Buffers.dll.meta
diff --git a/Editor/Plugins/System.Collections.Immutable.dll b/Editor/Plugins/System.Collections.Immutable.dll
diff --git a/Editor/Plugins/System.Collections.Immutable.dll.meta b/Editor/Plugins/System.Collections.Immutable.dll.meta
diff --git a/Editor/Plugins/System.Memory.dll b/Editor/Plugins/System.Memory.dll
diff --git a/Editor/Plugins/System.Memory.dll.meta b/Editor/Plugins/System.Memory.dll.meta
diff --git a/Editor/Plugins/System.Numerics.Vectors.dll b/Editor/Plugins/System.Numerics.Vectors.dll
diff --git a/Editor/Plugins/System.Numerics.Vectors.dll.meta b/Editor/Plugins/System.Numerics.Vectors.dll.meta
diff --git a/Editor/Plugins/System.Reflection.Metadata.dll b/Editor/Plugins/System.Reflection.Metadata.dll
diff --git a/Editor/Plugins/System.Reflection.Metadata.dll.meta b/Editor/Plugins/System.Reflection.Metadata.dll.meta
diff --git a/Editor/Plugins/System.Runtime.CompilerServices.Unsafe.dll b/Editor/Plugins/System.Runtime.CompilerServices.Unsafe.dll
diff --git a/Editor/Plugins/System.Runtime.CompilerServices.Unsafe.dll.meta b/Editor/Plugins/System.Runtime.CompilerServices.Unsafe.dll.meta
diff --git a/Editor/Plugins/System.Text.Encoding.CodePages.dll b/Editor/Plugins/System.Text.Encoding.CodePages.dll
diff --git a/Editor/Plugins/System.Text.Encoding.CodePages.dll.meta b/Editor/Plugins/System.Text.Encoding.CodePages.dll.meta
diff --git a/Editor/Plugins/System.Threading.Tasks.Extensions.dll b/Editor/Plugins/System.Threading.Tasks.Extensions.dll
diff --git a/Editor/Plugins/System.Threading.Tasks.Extensions.dll.meta b/Editor/Plugins/System.Threading.Tasks.Extensions.dll.meta
diff --git a/Editor/com.eastlylabs.rosalina.asmdef b/Editor/com.eastlylabs.rosalina.asmdef
@@ -5,9 +5,10 @@
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
-    "overrideReferences": false,
+    "overrideReferences": true,
     "precompiledReferences": [
-        "Microsoft.Bcl.AsyncInterfaces.dll"
+        "Microsoft.CodeAnalysis.dll",
+        "Microsoft.CodeAnalysis.CSharp.dll"
     ],
     "autoReferenced": true,
     "defineConstraints": [],

diff --git a/Tools~/Rosalina.Roslyn/Rosalina.Roslyn.csproj b/Tools~/Rosalina.Roslyn/Rosalina.Roslyn.csproj
@@ -4,37 +4,11 @@
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<AssemblyName>Rosalina.RoslynLibrary</AssemblyName>
 		<CopyLocalLockFileAssemblies>True</CopyLocalLockFileAssemblies>
+		<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.18.2" />
 		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
 	</ItemGroup>
 
-	<Target Name="ILRepack" AfterTargets="Build" Condition="'$(Configuration)' == 'Release'">
-		<PropertyGroup>
-			<WorkingDirectory>$(MSBuildThisFileDirectory)bin\$(Configuration)\$(TargetFramework)</WorkingDirectory>
-		</PropertyGroup>
-		<ItemGroup>
-			<InputAssemblies Include="Microsoft.CodeAnalysis.CSharp.dll" />
-			<InputAssemblies Include="Microsoft.CodeAnalysis.dll" />
-			<InputAssemblies Include="System.Buffers.dll" />
-			<InputAssemblies Include="System.Collections.Immutable.dll" />
-			<InputAssemblies Include="System.Memory.dll" />
-			<InputAssemblies Include="System.Numerics.Vectors.dll" />
-			<InputAssemblies Include="System.Reflection.Metadata.dll" />
-			<InputAssemblies Include="System.Runtime.CompilerServices.Unsafe.dll" />
-			<InputAssemblies Include="System.Text.Encoding.CodePages.dll" />
-			<InputAssemblies Include="System.Threading.Tasks.Extensions.dll" />
-		</ItemGroup>
-
-		<ILRepack
-            OutputType="$(OutputType)"
-            MainAssembly="$(AssemblyName).dll"
-            OutputAssembly="$(AssemblyName).dll"
-            InputAssemblies="@(InputAssemblies)"
-            InternalizeExcludeAssemblies="@(InternalizeExcludeAssemblies)"
-            WorkingDirectory="$(WorkingDirectory)" />
-	</Target>
-
 </Project>