Remove ILRepack dependency (#1992)
* Remove ILRepack from build system * Update deps/AssemblyProcessor folder
This commit is contained in:
Родитель
c45817e94b
Коммит
d3fa752243
|
@ -8,7 +8,6 @@
|
||||||
".NETCoreApp,Version=v6.0": {
|
".NETCoreApp,Version=v6.0": {
|
||||||
"Stride.Core.AssemblyProcessor/1.0.0": {
|
"Stride.Core.AssemblyProcessor/1.0.0": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ILRepack": "2.0.18",
|
|
||||||
"Microsoft.Build.Utilities.Core": "17.3.2",
|
"Microsoft.Build.Utilities.Core": "17.3.2",
|
||||||
"Mono.Cecil": "0.11.5",
|
"Mono.Cecil": "0.11.5",
|
||||||
"Mono.Options": "6.12.0.148"
|
"Mono.Options": "6.12.0.148"
|
||||||
|
@ -17,7 +16,6 @@
|
||||||
"Stride.Core.AssemblyProcessor.dll": {}
|
"Stride.Core.AssemblyProcessor.dll": {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ILRepack/2.0.18": {},
|
|
||||||
"Microsoft.Build.Framework/17.3.2": {
|
"Microsoft.Build.Framework/17.3.2": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"System.Security.Permissions": "6.0.0"
|
"System.Security.Permissions": "6.0.0"
|
||||||
|
@ -105,13 +103,6 @@
|
||||||
"serviceable": false,
|
"serviceable": false,
|
||||||
"sha512": ""
|
"sha512": ""
|
||||||
},
|
},
|
||||||
"ILRepack/2.0.18": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-sR5Aj3JLDbA8JwESfWYfigSz5k1oNSHPN434W1LX8sboWJYEOSQP/KkvZGmJKPgajzSUKkl2jDar3LPZiMFU4Q==",
|
|
||||||
"path": "ilrepack/2.0.18",
|
|
||||||
"hashPath": "ilrepack.2.0.18.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Microsoft.Build.Framework/17.3.2": {
|
"Microsoft.Build.Framework/17.3.2": {
|
||||||
"type": "package",
|
"type": "package",
|
||||||
"serviceable": true,
|
"serviceable": true,
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:9f49d4387554f62bc004132b83981db7361dca126d1785470d33aa6a7def835a
|
oid sha256:56959508d6a6d0308e188932954e28e4fd7652114d5110ce7045b88df2c639be
|
||||||
size 159744
|
size 172032
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
56959508D6A6D0308E188932954E28E4FD7652114D5110CE7045B88DF2C639BE
|
|
@ -1,3 +1,3 @@
|
||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:f01d69f07a88527792dafe98e67f2129b477a5af868972bf4d7726d74d44590c
|
oid sha256:26e9bcf9b58d24a7098b3f87e7934ab7c7dc88a1faa59cdaf0c006c3ad03911c
|
||||||
size 441856
|
size 90500
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
".NETStandard,Version=v2.0/": {
|
".NETStandard,Version=v2.0/": {
|
||||||
"Stride.Core.AssemblyProcessor/1.0.0": {
|
"Stride.Core.AssemblyProcessor/1.0.0": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ILRepack": "2.0.18",
|
|
||||||
"Microsoft.Build.Utilities.Core": "17.3.2",
|
"Microsoft.Build.Utilities.Core": "17.3.2",
|
||||||
"Mono.Cecil": "0.11.5",
|
"Mono.Cecil": "0.11.5",
|
||||||
"Mono.Options": "6.12.0.148",
|
"Mono.Options": "6.12.0.148",
|
||||||
|
@ -19,7 +18,6 @@
|
||||||
"Stride.Core.AssemblyProcessor.dll": {}
|
"Stride.Core.AssemblyProcessor.dll": {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ILRepack/2.0.18": {},
|
|
||||||
"Microsoft.Build.Framework/17.3.2": {
|
"Microsoft.Build.Framework/17.3.2": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"System.Security.Permissions": "6.0.0"
|
"System.Security.Permissions": "6.0.0"
|
||||||
|
@ -136,13 +134,6 @@
|
||||||
"serviceable": false,
|
"serviceable": false,
|
||||||
"sha512": ""
|
"sha512": ""
|
||||||
},
|
},
|
||||||
"ILRepack/2.0.18": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-sR5Aj3JLDbA8JwESfWYfigSz5k1oNSHPN434W1LX8sboWJYEOSQP/KkvZGmJKPgajzSUKkl2jDar3LPZiMFU4Q==",
|
|
||||||
"path": "ilrepack/2.0.18",
|
|
||||||
"hashPath": "ilrepack.2.0.18.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Microsoft.Build.Framework/17.3.2": {
|
"Microsoft.Build.Framework/17.3.2": {
|
||||||
"type": "package",
|
"type": "package",
|
||||||
"serviceable": true,
|
"serviceable": true,
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:94be07b9174da333cc863cff8ba50ff484280b28dee0b657b9a9dc0877355860
|
oid sha256:c57d607e5d46ae0bc2abb382533e8dd9991bb840ca42b9684ee93bc519d598a2
|
||||||
size 158720
|
size 171008
|
||||||
|
|
1
deps/AssemblyProcessor/netstandard2.0/Stride.Core.AssemblyProcessor.dll.hash
поставляемый
Normal file
1
deps/AssemblyProcessor/netstandard2.0/Stride.Core.AssemblyProcessor.dll.hash
поставляемый
Normal file
|
@ -0,0 +1 @@
|
||||||
|
C57D607E5D46AE0BC2ABB382533E8DD9991BB840CA42B9684EE93BC519D598A2
|
|
@ -1,3 +1,3 @@
|
||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:6aebc1244c93dd5afee900815020971fbaa96ac7ef17b82325adc7303e4271f6
|
oid sha256:006e59bcb6f313f09365c2cdfa3bdaaec431556649a4abb83fb23e0d8783ac2a
|
||||||
size 441856
|
size 88024
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ProductVersion>16.0</ProductVersion>
|
|
||||||
<SchemaVersion>2.0</SchemaVersion>
|
|
||||||
<OutputType>Library</OutputType>
|
<OutputType>Library</OutputType>
|
||||||
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
|
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
|
||||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||||
|
@ -36,7 +34,6 @@
|
||||||
|
|
||||||
<!-- Referenced Packages -->
|
<!-- Referenced Packages -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="ILRepack" Version="2.0.18" PrivateAssets="All" />
|
|
||||||
<PackageReference Include="Mono.Cecil" Version="0.11.5" />
|
<PackageReference Include="Mono.Cecil" Version="0.11.5" />
|
||||||
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
|
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
|
||||||
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.3.2" ExcludeAssets="runtime" />
|
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.3.2" ExcludeAssets="runtime" />
|
||||||
|
@ -130,17 +127,14 @@
|
||||||
/>
|
/>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<!-- Packs the BuildItems into a single .Packed DLL and generates a .hash file from it -->
|
<!-- Packs the BuildItems into a single DLL and generates a .hash file from it -->
|
||||||
<Target Name="GenerateHash" AfterTargets="CopyFiles">
|
<Target Name="GenerateHash" AfterTargets="CopyFiles">
|
||||||
<!-- Repack the assemblies into a single file -->
|
<!-- Generate the hash and then write it to disk with the .hash extension -->
|
||||||
<Exec Command="cd "$(DependencyDir)\AssemblyProcessor\$(TargetFramework)"
|
<GetFileHash Files="$(DependencyDir)\AssemblyProcessor\$(TargetFramework)\Stride.Core.AssemblyProcessor$(TargetExt)">
|
||||||
"$(ILRepack)" Stride.Core.AssemblyProcessor$(TargetExt) Mono.Cecil.dll Mono.Cecil.Mdb.dll Mono.Cecil.Pdb.dll Mono.Cecil.Rocks.dll Mono.Options.dll /out:Stride.Core.AssemblyProcessor.Packed$(TargetExt)"/>
|
|
||||||
<!-- Generate the hash and then write it to disk with the .hash extension -->
|
|
||||||
<GetFileHash Files="$(DependencyDir)\AssemblyProcessor\$(TargetFramework)\Stride.Core.AssemblyProcessor.Packed$(TargetExt)">
|
|
||||||
<Output
|
<Output
|
||||||
TaskParameter="Hash"
|
TaskParameter="Hash"
|
||||||
PropertyName="PackedAssemblyHash" />
|
PropertyName="PackedAssemblyHash" />
|
||||||
</GetFileHash>
|
</GetFileHash>
|
||||||
<WriteAllText Path="$(DependencyDir)\AssemblyProcessor\$(TargetFramework)\Stride.Core.AssemblyProcessor.Packed$(TargetExt).hash" Contents="$(PackedAssemblyHash)"/>
|
<WriteAllText Path="$(DependencyDir)\AssemblyProcessor\$(TargetFramework)\Stride.Core.AssemblyProcessor$(TargetExt).hash" Contents="$(PackedAssemblyHash)"/>
|
||||||
</Target>
|
</Target>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -50,14 +50,14 @@
|
||||||
<StrideAssemblyProcessor Condition="'$(StrideAssemblyProcessor)' == ''">true</StrideAssemblyProcessor>
|
<StrideAssemblyProcessor Condition="'$(StrideAssemblyProcessor)' == ''">true</StrideAssemblyProcessor>
|
||||||
<StrideAssemblyProcessorFramework>netstandard2.0</StrideAssemblyProcessorFramework>
|
<StrideAssemblyProcessorFramework>netstandard2.0</StrideAssemblyProcessorFramework>
|
||||||
<StrideAssemblyProcessorExt>.dll</StrideAssemblyProcessorExt>
|
<StrideAssemblyProcessorExt>.dll</StrideAssemblyProcessorExt>
|
||||||
<StrideAssemblyProcessorBasePath Condition="Exists('$(MSBuildThisFileDirectory)..\tools\AssemblyProcessor\$(StrideAssemblyProcessorFramework)\Stride.Core.AssemblyProcessor.Packed$(StrideAssemblyProcessorExt)')">$(MSBuildThisFileDirectory)..\tools\AssemblyProcessor\$(StrideAssemblyProcessorFramework)\</StrideAssemblyProcessorBasePath>
|
<StrideAssemblyProcessorBasePath Condition="Exists('$(MSBuildThisFileDirectory)..\tools\AssemblyProcessor\$(StrideAssemblyProcessorFramework)\Stride.Core.AssemblyProcessor$(StrideAssemblyProcessorExt)')">$(MSBuildThisFileDirectory)..\tools\AssemblyProcessor\$(StrideAssemblyProcessorFramework)\</StrideAssemblyProcessorBasePath>
|
||||||
<StrideAssemblyProcessorBasePath Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\deps\AssemblyProcessor\$(StrideAssemblyProcessorFramework)\Stride.Core.AssemblyProcessor.Packed$(StrideAssemblyProcessorExt)')">$(MSBuildThisFileDirectory)..\..\..\..\deps\AssemblyProcessor\$(StrideAssemblyProcessorFramework)\</StrideAssemblyProcessorBasePath>
|
<StrideAssemblyProcessorBasePath Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\deps\AssemblyProcessor\$(StrideAssemblyProcessorFramework)\Stride.Core.AssemblyProcessor$(StrideAssemblyProcessorExt)')">$(MSBuildThisFileDirectory)..\..\..\..\deps\AssemblyProcessor\$(StrideAssemblyProcessorFramework)\</StrideAssemblyProcessorBasePath>
|
||||||
<StrideAssemblyProcessorPath>$(StrideAssemblyProcessorBasePath)Stride.Core.AssemblyProcessor.Packed$(StrideAssemblyProcessorExt)</StrideAssemblyProcessorPath>
|
<StrideAssemblyProcessorPath>$(StrideAssemblyProcessorBasePath)Stride.Core.AssemblyProcessor$(StrideAssemblyProcessorExt)</StrideAssemblyProcessorPath>
|
||||||
<StrideAssemblyProcessorSerializationHashFile>$(IntermediateOutputPath)$(TargetName).sdserializationhash</StrideAssemblyProcessorSerializationHashFile>
|
<StrideAssemblyProcessorSerializationHashFile>$(IntermediateOutputPath)$(TargetName).sdserializationhash</StrideAssemblyProcessorSerializationHashFile>
|
||||||
|
|
||||||
<StrideAssemblyProcessorHash>$([System.IO.File]::ReadAllText('$(StrideAssemblyProcessorPath).hash'))</StrideAssemblyProcessorHash>
|
<StrideAssemblyProcessorHash>$([System.IO.File]::ReadAllText('$(StrideAssemblyProcessorPath).hash'))</StrideAssemblyProcessorHash>
|
||||||
<StrideAssemblyProcessorTempBasePath>$(TEMP)\Stride\AssemblyProcessor\$(StrideAssemblyProcessorFramework)\$(StrideAssemblyProcessorHash)\</StrideAssemblyProcessorTempBasePath>
|
<StrideAssemblyProcessorTempBasePath>$(TEMP)\Stride\AssemblyProcessor\$(StrideAssemblyProcessorFramework)\$(StrideAssemblyProcessorHash)\</StrideAssemblyProcessorTempBasePath>
|
||||||
<StrideAssemblyProcessorTempPath>$(StrideAssemblyProcessorTempBasePath)Stride.Core.AssemblyProcessor.Packed$(StrideAssemblyProcessorExt)</StrideAssemblyProcessorTempPath>
|
<StrideAssemblyProcessorTempPath>$(StrideAssemblyProcessorTempBasePath)Stride.Core.AssemblyProcessor$(StrideAssemblyProcessorExt)</StrideAssemblyProcessorTempPath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<UsingTask TaskName="AssemblyProcessorTask" AssemblyFile="$(StrideAssemblyProcessorTempPath)" Condition=" '$(StrideAssemblyProcessorTempPath)' != '' And '$(StrideAssemblyProcessorDev)' != 'true' "/>
|
<UsingTask TaskName="AssemblyProcessorTask" AssemblyFile="$(StrideAssemblyProcessorTempPath)" Condition=" '$(StrideAssemblyProcessorTempPath)' != '' And '$(StrideAssemblyProcessorDev)' != 'true' "/>
|
||||||
<Target Name="StrideRunAssemblyProcessor" DependsOnTargets="ResolveAssemblyReferences">
|
<Target Name="StrideRunAssemblyProcessor" DependsOnTargets="ResolveAssemblyReferences">
|
||||||
|
|
|
@ -91,9 +91,9 @@
|
||||||
|
|
||||||
<StrideAssemblyProcessorFramework>netstandard2.0</StrideAssemblyProcessorFramework>
|
<StrideAssemblyProcessorFramework>netstandard2.0</StrideAssemblyProcessorFramework>
|
||||||
<StrideAssemblyProcessorExt>.dll</StrideAssemblyProcessorExt>
|
<StrideAssemblyProcessorExt>.dll</StrideAssemblyProcessorExt>
|
||||||
<StrideAssemblyProcessorHash Condition="'$(StrideAssemblyProcessorBasePath)' != ''">$([System.IO.File]::ReadAllText('$(StrideAssemblyProcessorBasePath)\$(StrideAssemblyProcessorFramework)\Stride.Core.AssemblyProcessor.Packed$(StrideAssemblyProcessorExt).hash'))</StrideAssemblyProcessorHash>
|
<StrideAssemblyProcessorHash Condition="'$(StrideAssemblyProcessorBasePath)' != ''">$([System.IO.File]::ReadAllText('$(StrideAssemblyProcessorBasePath)\$(StrideAssemblyProcessorFramework)\Stride.Core.AssemblyProcessor$(StrideAssemblyProcessorExt).hash'))</StrideAssemblyProcessorHash>
|
||||||
<StrideAssemblyProcessorTempBasePath Condition="'$(StrideAssemblyProcessorBasePath)' != ''">$(TEMP)\Stride\AssemblyProcessor\$(StrideAssemblyProcessorHash)\$(StrideAssemblyProcessorFramework)\</StrideAssemblyProcessorTempBasePath>
|
<StrideAssemblyProcessorTempBasePath Condition="'$(StrideAssemblyProcessorBasePath)' != ''">$(TEMP)\Stride\AssemblyProcessor\$(StrideAssemblyProcessorHash)\$(StrideAssemblyProcessorFramework)\</StrideAssemblyProcessorTempBasePath>
|
||||||
<StrideAssemblyProcessorTempPath Condition="'$(StrideAssemblyProcessorBasePath)' != ''">$(StrideAssemblyProcessorTempBasePath)Stride.Core.AssemblyProcessor.Packed$(StrideAssemblyProcessorExt)</StrideAssemblyProcessorTempPath>
|
<StrideAssemblyProcessorTempPath Condition="'$(StrideAssemblyProcessorBasePath)' != ''">$(StrideAssemblyProcessorTempBasePath)Stride.Core.AssemblyProcessor$(StrideAssemblyProcessorExt)</StrideAssemblyProcessorTempPath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<!-- Setup default output path for C++ projects -->
|
<!-- Setup default output path for C++ projects -->
|
||||||
|
|
Загрузка…
Ссылка в новой задаче