Skip to content

Commit c42703e

Browse files
authored
Revert ILRepack introduced by #24 (#46)
The ILRepack has introduced type conflict issues that are not easily solved. This boils down to the fact that the public API surface of the Platform SDK exposes types provided by dependencies. ILRepack creates an artificial assembly to export those types. However any user will need to import the original dependency assembly in order to construct function arguments with the types in question. This will result in duplicate type errors as they will exist in both the user-imported dependency and the new artificial assembly created by the ILRepack.
1 parent 56b35c2 commit c42703e

File tree

3 files changed

+2
-44
lines changed

3 files changed

+2
-44
lines changed

.buildkite/nightly.steps.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ common: &common
1717
- "permission_set=builder"
1818
- "platform=linux"
1919
- "scaler_version=2"
20+
- "machine_type=quarter"
2021
- "queue=${CI_BUILDER_QUEUE:-v3-1564411674-9c5746811d9f2beb-------z}"
2122
timeout_in_minutes: 60 # TODO(ENG-548): reduce timeout once agent-cold-start is optimised.
2223
retry:

.buildkite/premerge.steps.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ common: &common
1717
- "permission_set=builder"
1818
- "platform=linux"
1919
- "scaler_version=2"
20+
- "machine_type=quarter"
2021
- "queue=${CI_BUILDER_QUEUE:-v3-1564411674-9c5746811d9f2beb-------z}"
2122
timeout_in_minutes: 60 # TODO(ENG-548): reduce timeout once agent-cold-start is optimised.
2223
retry:

apis/apis.csproj

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -22,51 +22,7 @@
2222

2323
<ItemGroup>
2424
<PackageReference Include="Google.LongRunning" Version="1.0.0" />
25-
<PackageReference Include="ILRepack.MSBuild.Task" Version="2.0.13" />
2625
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0-preview.2" />
2726
</ItemGroup>
2827

29-
<!-- For details on configuring ILRepack see https://www.phillipsj.net/posts/using-ilrepack-with-dotnet-core-sdk-and-dotnet-standard -->
30-
<Target Name="ILRepack" AfterTargets="Pack" Condition="'$(Configuration)' == 'Release' ">
31-
<PropertyGroup>
32-
<WorkingDirectory>$(MSBuildThisFileDirectory)bin\$(Configuration)\netstandard1.6</WorkingDirectory>
33-
</PropertyGroup>
34-
35-
<ItemGroup>
36-
<InputAssemblies Include="Improbable.SpatialOS.Platform.dll" />
37-
<InputAssemblies Include="Google.Api.CommonProtos.dll" />
38-
<InputAssemblies Include="Google.Api.Gax.Grpc.dll" />
39-
<InputAssemblies Include="Google.Api.Gax.dll" />
40-
<InputAssemblies Include="Google.Apis.Auth.PlatformServices.dll" />
41-
<InputAssemblies Include="Google.Apis.Auth.dll" />
42-
<InputAssemblies Include="Google.Apis.Core.dll" />
43-
<InputAssemblies Include="Google.Apis.dll" />
44-
<InputAssemblies Include="Google.LongRunning.dll" />
45-
<InputAssemblies Include="Google.Protobuf.dll" />
46-
<InputAssemblies Include="Google.Protobuf.dll" />
47-
<InputAssemblies Include="Grpc.Auth.dll" />
48-
<InputAssemblies Include="Grpc.Core.dll" />
49-
<InputAssemblies Include="Newtonsoft.Json.dll" />
50-
<InputAssemblies Include="System.Interactive.Async.dll" />
51-
</ItemGroup>
52-
53-
<!-- These DLLs are not internalised because they contains types that are user-facing. Internalising would mess up the namespace. -->
54-
<ItemGroup>
55-
<InternalizeExcludeAssemblies Include="Improbable.SpatialOS.Platform" />
56-
<InternalizeExcludeAssemblies Include="Google.Api.Gax" />
57-
<InternalizeExcludeAssemblies Include="Google.LongRunning" />
58-
<InternalizeExcludeAssemblies Include="Google.Protobuf.WellKnownTypes" />
59-
<InternalizeExcludeAssemblies Include="Grpc.Core" />
60-
</ItemGroup>
61-
62-
<ILRepack Parallel="true" OutputType="$(OutputType)" MainAssembly="$(AssemblyName).dll" OutputAssembly="$(AssemblyName).dll" InputAssemblies="@(InputAssemblies)" InternalizeExcludeAssemblies="@(InternalizeExcludeAssemblies)" Internalize="true" WorkingDirectory="$(WorkingDirectory)" />
63-
64-
<ItemGroup>
65-
<AssembliesToDelete Include="$(WorkingDirectory)/%(InputAssemblies.Identity)" />
66-
</ItemGroup>
67-
68-
<Delete Files="@(AssembliesToDelete)" />
69-
70-
</Target>
71-
7228
</Project>

0 commit comments

Comments
 (0)