Skip to content

Revert ILRepack introduced by #24 #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 8, 2019
Merged

Revert ILRepack introduced by #24 #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .buildkite/nightly.steps.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ common: &common
- "permission_set=builder"
- "platform=linux"
- "scaler_version=2"
- "machine_type=quarter"
- "queue=${CI_BUILDER_QUEUE:-v3-1564411674-9c5746811d9f2beb-------z}"
timeout_in_minutes: 60 # TODO(ENG-548): reduce timeout once agent-cold-start is optimised.
retry:
Expand Down
1 change: 1 addition & 0 deletions .buildkite/premerge.steps.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ common: &common
- "permission_set=builder"
- "platform=linux"
- "scaler_version=2"
- "machine_type=quarter"
- "queue=${CI_BUILDER_QUEUE:-v3-1564411674-9c5746811d9f2beb-------z}"
timeout_in_minutes: 60 # TODO(ENG-548): reduce timeout once agent-cold-start is optimised.
retry:
Expand Down
44 changes: 0 additions & 44 deletions apis/apis.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,51 +22,7 @@

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

<!-- For details on configuring ILRepack see https://www.phillipsj.net/posts/using-ilrepack-with-dotnet-core-sdk-and-dotnet-standard -->
<Target Name="ILRepack" AfterTargets="Pack" Condition="'$(Configuration)' == 'Release' ">
<PropertyGroup>
<WorkingDirectory>$(MSBuildThisFileDirectory)bin\$(Configuration)\netstandard1.6</WorkingDirectory>
</PropertyGroup>

<ItemGroup>
<InputAssemblies Include="Improbable.SpatialOS.Platform.dll" />
<InputAssemblies Include="Google.Api.CommonProtos.dll" />
<InputAssemblies Include="Google.Api.Gax.Grpc.dll" />
<InputAssemblies Include="Google.Api.Gax.dll" />
<InputAssemblies Include="Google.Apis.Auth.PlatformServices.dll" />
<InputAssemblies Include="Google.Apis.Auth.dll" />
<InputAssemblies Include="Google.Apis.Core.dll" />
<InputAssemblies Include="Google.Apis.dll" />
<InputAssemblies Include="Google.LongRunning.dll" />
<InputAssemblies Include="Google.Protobuf.dll" />
<InputAssemblies Include="Google.Protobuf.dll" />
<InputAssemblies Include="Grpc.Auth.dll" />
<InputAssemblies Include="Grpc.Core.dll" />
<InputAssemblies Include="Newtonsoft.Json.dll" />
<InputAssemblies Include="System.Interactive.Async.dll" />
</ItemGroup>

<!-- These DLLs are not internalised because they contains types that are user-facing. Internalising would mess up the namespace. -->
<ItemGroup>
<InternalizeExcludeAssemblies Include="Improbable.SpatialOS.Platform" />
<InternalizeExcludeAssemblies Include="Google.Api.Gax" />
<InternalizeExcludeAssemblies Include="Google.LongRunning" />
<InternalizeExcludeAssemblies Include="Google.Protobuf.WellKnownTypes" />
<InternalizeExcludeAssemblies Include="Grpc.Core" />
</ItemGroup>

<ILRepack Parallel="true" OutputType="$(OutputType)" MainAssembly="$(AssemblyName).dll" OutputAssembly="$(AssemblyName).dll" InputAssemblies="@(InputAssemblies)" InternalizeExcludeAssemblies="@(InternalizeExcludeAssemblies)" Internalize="true" WorkingDirectory="$(WorkingDirectory)" />

<ItemGroup>
<AssembliesToDelete Include="$(WorkingDirectory)/%(InputAssemblies.Identity)" />
</ItemGroup>

<Delete Files="@(AssembliesToDelete)" />

</Target>

</Project>