Skip to content

Remove ilasm/ildasm workaround - all offending dlls have been removed or fixed #1352

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
Nov 6, 2019
Merged

Remove ilasm/ildasm workaround - all offending dlls have been removed or fixed #1352

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 build-source-tarball.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ for path in ${ilSrcPaths[@]}; do
fi
if [[ "$remove" == "true" ]]; then
rm -rf "$TARBALL_ROOT/packages/reference/staging/$path"
rm -rf "$TARBALL_ROOT/packages/reference/source/$path"
fi
done

Expand Down
71 changes: 0 additions & 71 deletions build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,77 +88,6 @@
<ReferenceOnlyPackageDlls Include="$(ReferencePackagesSourceDir)**/*.dll" />
</ItemGroup>

<!-- Temporary workaround to exclude dlls that can't be round-tripped. See: https://github.com/dotnet/coreclr/issues/20262
They'll end up in the source directory as dlls for now
-->
<ItemGroup>
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/System.Runtime.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/netstandard.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)netstandard.library/**/*.dll" />
<!-- Microsoft.AspNet.App DLLs that include .resource files -->
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Antiforgery.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Authentication.OAuth.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Authentication.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Authorization.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Cors.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Cryptography.Internal.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.DataProtection.Abstractions.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.DataProtection.Extensions.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.DataProtection.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Diagnostics.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Hosting.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Http.Abstractions.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Identity.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Localization.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Mvc.Abstractions.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Mvc.Core.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Mvc.Cors.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Mvc.DataAnnotations.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Mvc.Formatters.Xml.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Mvc.Razor.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Mvc.RazorPages.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Mvc.TagHelpers.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Mvc.ViewFeatures.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Authorization.Policy.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Razor.Runtime.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Rewrite.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Routing.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Server.HttpSys.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Server.IIS.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Server.IIS.CoreStrings.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Server.Kestrel.Core.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Server.Kestrel.Core.CoreStrings.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.SocketsStrings.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Session.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.StaticFiles.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.WebUtilities.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Configuration.Binder.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Configuration.CommandLine.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Configuration.FileExtensions.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Configuration.Ini.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Configuration.Json.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Configuration.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Configuration.UserSecrets.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Configuration.Xml.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.DependencyInjection.Abstractions.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.DependencyInjection.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.DependencyModel.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Http.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Identity.Core.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Localization.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Logging.Abstractions.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Logging.Abstractions.Resource.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Options.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Primitives.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/System.Diagnostics.Contracts.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/System.IO.Pipelines.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/System.Memory.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/System.Text.Encodings.Web.dll" />
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/System.Threading.Channels.dll" />
</ItemGroup>
<!-- End Temporary workaround -->

<Message Importance="High" Text="Reference-only Packages:" />
<Message Importance="High" Text="%(ReferenceOnlyPackages.Identity)" />

Expand Down
9 changes: 0 additions & 9 deletions tools-local/init-build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,6 @@
<MakeDir Directories="$(ReferencePackagesStagingDir)%(IlSource.RecursiveDir)" />
<Exec Command="$(IlasmPath) %(IlSource.Identity) -dll -quiet -nologo -output=$(ReferencePackagesStagingDir)%(IlSource.RecursiveDir)%(IlSource.Filename).dll" />

<!-- Temporary workaround to copy dlls that can't be round-tripped
They just get copied from the source to the package staging area
-->
<ItemGroup>
<DllsInSource Include="$(ReferencePackagesSourceDir)**/*.dll" />
</ItemGroup>
<Copy SourceFiles="%(DllsInSource.Identity)" DestinationFiles="$(ReferencePackagesStagingDir)%(DllsInSource.RecursiveDir)%(DllsInSource.Filename).dll" />

<!-- End Temporary workaround -->
<Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Done building reference-only assemblies." />

<Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Packing reference-only packages." />
Expand Down