Skip to content

Commit

Permalink
Updated extenject
Browse files Browse the repository at this point in the history
  • Loading branch information
@grofit
grofit committed Dec 18, 2020
1 parent 5514729 commit 4267649
Show file tree
Hide file tree
Showing 13 changed files with 199 additions and 18 deletions.
20 changes: 20 additions & 0 deletions src/Assembly-CSharp-Editor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,18 @@
<Reference Include="Zenject-usage">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/Source/Usage/Zenject-usage.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil.Mdb">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.Mdb.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil.Pdb">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.Pdb.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil.Rocks">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.Rocks.dll</HintPath>
</Reference>
<Reference Include="mscorlib">
<HintPath>C:/Program Files/Unity/Hub/Editor/2018.4.15f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -721,6 +733,14 @@
<Project>{3D4F1E55-9B37-CE1A-5045-137ED0A1D4C9}</Project>
<Name>Zenject</Name>
</ProjectReference>
<ProjectReference Include="Zenject-ReflectionBaking-Editor.csproj">
<Project>{A2779ADF-4873-DD06-56B6-BF21C8C3616D}</Project>
<Name>Zenject-ReflectionBaking-Editor</Name>
</ProjectReference>
<ProjectReference Include="Zenject-PoolMonitor-Editor.csproj">
<Project>{D1981D52-7C26-4A2F-54B1-3F2018FF6872}</Project>
<Name>Zenject-PoolMonitor-Editor</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
20 changes: 20 additions & 0 deletions src/Assembly-CSharp-firstpass.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,18 @@
<Reference Include="Zenject-usage">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/Source/Usage/Zenject-usage.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil.Mdb">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.Mdb.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil.Pdb">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.Pdb.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil.Rocks">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.Rocks.dll</HintPath>
</Reference>
<Reference Include="mscorlib">
<HintPath>C:/Program Files/Unity/Hub/Editor/2018.4.15f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -874,6 +886,14 @@
<Project>{3D4F1E55-9B37-CE1A-5045-137ED0A1D4C9}</Project>
<Name>Zenject</Name>
</ProjectReference>
<ProjectReference Include="Zenject-ReflectionBaking-Editor.csproj">
<Project>{A2779ADF-4873-DD06-56B6-BF21C8C3616D}</Project>
<Name>Zenject-ReflectionBaking-Editor</Name>
</ProjectReference>
<ProjectReference Include="Zenject-PoolMonitor-Editor.csproj">
<Project>{D1981D52-7C26-4A2F-54B1-3F2018FF6872}</Project>
<Name>Zenject-PoolMonitor-Editor</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
20 changes: 20 additions & 0 deletions src/Assembly-CSharp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,18 @@
<Reference Include="Zenject-usage">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/Source/Usage/Zenject-usage.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil.Mdb">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.Mdb.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil.Pdb">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.Pdb.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil.Rocks">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.Rocks.dll</HintPath>
</Reference>
<Reference Include="mscorlib">
<HintPath>C:/Program Files/Unity/Hub/Editor/2018.4.15f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -725,6 +737,14 @@
<Project>{3D4F1E55-9B37-CE1A-5045-137ED0A1D4C9}</Project>
<Name>Zenject</Name>
</ProjectReference>
<ProjectReference Include="Zenject-ReflectionBaking-Editor.csproj">
<Project>{A2779ADF-4873-DD06-56B6-BF21C8C3616D}</Project>
<Name>Zenject-ReflectionBaking-Editor</Name>
</ProjectReference>
<ProjectReference Include="Zenject-PoolMonitor-Editor.csproj">
<Project>{D1981D52-7C26-4A2F-54B1-3F2018FF6872}</Project>
<Name>Zenject-PoolMonitor-Editor</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
2 changes: 1 addition & 1 deletion src/Assets/Plugins/Zenject/Source/Install/Contexts/Context.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ void CheckInstallerPrefabTypes(List<MonoInstaller> installers, List<MonoInstalle
#if UNITY_2019_1_OR_NEWER
// TODO - Is there a way to check this using GetPrefabAssetType in 2019+?
#else
#if UNITY_2018_4_OR_NEWER
#if UNITY_2018_3
Assert.That(PrefabUtility.GetPrefabAssetType(installer.gameObject) == PrefabAssetType.NotAPrefab,
#else
Assert.That(PrefabUtility.GetPrefabType(installer.gameObject) != PrefabType.Prefab,
Expand Down
2 changes: 1 addition & 1 deletion src/Assets/Plugins/Zenject/Version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.1.0
9.1.0
3 changes: 2 additions & 1 deletion src/Assets/Plugins/Zenject/Version.txt.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/Assets/Plugins/Zenject/Zenject.asmdef.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions src/Zenject-Editor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,18 @@
<Reference Include="Zenject-usage">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/Source/Usage/Zenject-usage.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil.Mdb">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.Mdb.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil.Pdb">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.Pdb.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil.Rocks">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.Rocks.dll</HintPath>
</Reference>
<Reference Include="mscorlib">
<HintPath>C:/Program Files/Unity/Hub/Editor/2018.4.15f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
</Reference>
Expand Down
10 changes: 5 additions & 5 deletions src/Zenject-PoolMonitor-Editor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,21 +320,21 @@
<Reference Include="JetBrains.Rider.Unity.Editor.Plugin.Repacked">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.dll</HintPath>
<Reference Include="Zenject-usage">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/Source/Usage/Zenject-usage.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil.Mdb">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.Mdb.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil.Pdb">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.Pdb.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil.Rocks">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.Rocks.dll</HintPath>
</Reference>
<Reference Include="Zenject-usage">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/Source/Usage/Zenject-usage.dll</HintPath>
</Reference>
<Reference Include="mscorlib">
<HintPath>C:/Program Files/Unity/Hub/Editor/2018.4.15f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
</Reference>
Expand Down
10 changes: 5 additions & 5 deletions src/Zenject-ReflectionBaking-Editor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,21 +325,21 @@
<Reference Include="JetBrains.Rider.Unity.Editor.Plugin.Repacked">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.dll</HintPath>
<Reference Include="Zenject-usage">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/Source/Usage/Zenject-usage.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil.Mdb">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.Mdb.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil.Pdb">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.Pdb.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil.Rocks">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.Rocks.dll</HintPath>
</Reference>
<Reference Include="Zenject-usage">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/Source/Usage/Zenject-usage.dll</HintPath>
</Reference>
<Reference Include="mscorlib">
<HintPath>C:/Program Files/Unity/Hub/Editor/2018.4.15f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
</Reference>
Expand Down
10 changes: 5 additions & 5 deletions src/Zenject-TestFramework.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,21 +322,21 @@
<Reference Include="JetBrains.Rider.Unity.Editor.Plugin.Repacked">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.dll</HintPath>
<Reference Include="Zenject-usage">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/Source/Usage/Zenject-usage.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil.Mdb">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.Mdb.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil.Pdb">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.Pdb.dll</HintPath>
</Reference>
<Reference Include="Zenject.ReflectionBaking.Mono.Cecil.Rocks">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Lib/Zenject.ReflectionBaking.Mono.Cecil.Rocks.dll</HintPath>
</Reference>
<Reference Include="Zenject-usage">
<HintPath>E:/Code/open-source/ecsrx/ecsrx.unity/src/Assets/Plugins/Zenject/Source/Usage/Zenject-usage.dll</HintPath>
</Reference>
<Reference Include="mscorlib">
<HintPath>C:/Program Files/Unity/Hub/Editor/2018.4.15f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
</Reference>
Expand Down
Loading

0 comments on commit 4267649

Please sign in to comment.