Skip to content
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

Jump to bottom

Updating SignToolData to include the produced nuget packages #1860

Merged
merged 5 commits into from
Jan 19, 2018
Merged

Updating SignToolData to include the produced nuget packages #1860

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ed1fd9
Updating SignToolData to include the produced nuget packages
tannergooding Jan 18, 2018
f0a88da
Merge pull request #1858 from tannergooding/release/2.0.0
tannergooding Jan 18, 2018
de775aa
Merge remote-tracking branch 'dotnet/release/2.0.0' into release/2.1
tannergooding Jan 18, 2018
76d6b27
Merge pull request #1859 from tannergooding/release/2.1
tannergooding Jan 18, 2018
f4510fc
Merge remote-tracking branch 'dotnet/release/2.1'
tannergooding Jan 18, 2018
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
134 changes: 126 additions & 8 deletions build/SignToolData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,133 @@
"certificate": "Microsoft402",
"strongName": "MsSharedLib72",
"values": [
"bin/Sdks/Microsoft.NET.Sdk/tools/netcoreapp2.0/Microsoft.NET.Build.Tasks.dll",
"bin/Sdks/Microsoft.NET.Sdk/tools/netcoreapp2.0/*/Microsoft.NET.Build.Tasks.resources.dll",
"bin/Sdks/Microsoft.NET.Sdk/tools/net46/Microsoft.NET.Build.Tasks.dll",
"bin/Sdks/Microsoft.NET.Sdk/tools/net46/*/Microsoft.NET.Build.Tasks.resources.dll",
"bin/Sdks/Microsoft.NET.Build.Extensions/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/tools/netcoreapp2.0/Microsoft.NET.Build.Extensions.Tasks.dll",
"bin/Sdks/Microsoft.NET.Build.Extensions/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/tools/netcoreapp2.0/*/Microsoft.NET.Build.Extensions.Tasks.resources.dll",
"bin/Sdks/Microsoft.NET.Build.Extensions/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/tools/net46/Microsoft.NET.Build.Extensions.Tasks.dll",
"bin/Sdks/Microsoft.NET.Build.Extensions/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/tools/net46/*/Microsoft.NET.Build.Extensions.Tasks.resources.dll",
"bin/Sdks/Microsoft.NET.Sdk/tools/*/Microsoft.NET.Build.Tasks.dll",
"bin/Sdks/Microsoft.NET.Sdk/tools/*/*/Microsoft.NET.Build.Tasks.resources.dll",
"bin/Sdks/Microsoft.NET.Build.Extensions/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/tools/*/Microsoft.NET.Build.Extensions.Tasks.dll",
"bin/Sdks/Microsoft.NET.Build.Extensions/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/tools/*/*/Microsoft.NET.Build.Extensions.Tasks.resources.dll"
]
},
{
"certificate": null,
"strongName": null,
"values": [
"packages/*.nupkg"
]
}
],
"exclude": [
"Microsoft.DotNet.PlatformAbstractions.dll",
"Microsoft.Extensions.DependencyModel.dll",
"Microsoft.Win32.Primitives.dll",
"netfx.force.conflicts.dll",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm surprised that most of these are in our nupkg. They are supposed to be pulled in separately by the CLI from the corefx support package.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe most of them are in the tools directories.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(for netcoreapp)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most of them are from Microsoft.NET.Build.Extensions\msbuildExtensions\Microsoft\Microsoft.NET.Build.Extensions, but those are excluded from the CLI ingestion here: https://github.com/dotnet/cli/blob/5c35438cfe1ac17fd4c748b8be6c2818d1238807/build/MSBuildExtensions.targets#L10-L17

We could (and probably should) exclude them from the .nupkg and not need to update these exclusions when the corefx support package changes.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tools\netcoreapp2.0 has nothing but our assembly + satellites. Some of these are from tools/net46 and necessary, but not all of them.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough, but that looks like it should be a separate work item, since this has been like this since before the infrastructure switch.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. I filed #1865

"netstandard.dll",
"Newtonsoft.Json.dll",
"NuGet.Common.dll",
"NuGet.Configuration.dll",
"NuGet.DependencyResolver.Core.dll",
"NuGet.Frameworks.dll",
"NuGet.LibraryModel.dll",
"NuGet.Packaging.Core.dll",
"NuGet.Packaging.dll",
"NuGet.ProjectModel.dll",
"NuGet.Protocol.dll",
"NuGet.Versioning.dll",
"System.AppContext.dll",
"System.Buffers.dll",
"System.Collections.Concurrent.dll",
"System.Collections.dll",
"System.Collections.Immutable.dll",
"System.Collections.NonGeneric.dll",
"System.Collections.Specialized.dll",
"System.ComponentModel.dll",
"System.ComponentModel.EventBasedAsync.dll",
"System.ComponentModel.Primitives.dll",
"System.ComponentModel.TypeConverter.dll",
"System.Console.dll",
"System.Data.Common.dll",
"System.Diagnostics.Contracts.dll",
"System.Diagnostics.Debug.dll",
"System.Diagnostics.FileVersionInfo.dll",
"System.Diagnostics.Process.dll",
"System.Diagnostics.StackTrace.dll",
"System.Diagnostics.TextWriterTraceListener.dll",
"System.Diagnostics.Tools.dll",
"System.Diagnostics.TraceSource.dll",
"System.Diagnostics.Tracing.dll",
"System.Drawing.Primitives.dll",
"System.Dynamic.Runtime.dll",
"System.Globalization.Calendars.dll",
"System.Globalization.dll",
"System.Globalization.Extensions.dll",
"System.IO.Compression.dll",
"System.IO.Compression.ZipFile.dll",
"System.IO.dll",
"System.IO.FileSystem.dll",
"System.IO.FileSystem.DriveInfo.dll",
"System.IO.FileSystem.Primitives.dll",
"System.IO.FileSystem.Watcher.dll",
"System.IO.IsolatedStorage.dll",
"System.IO.MemoryMappedFiles.dll",
"System.IO.Pipes.dll",
"System.IO.UnmanagedMemoryStream.dll",
"System.Linq.dll",
"System.Linq.Expressions.dll",
"System.Linq.Parallel.dll",
"System.Linq.Queryable.dll",
"System.Net.Http.dll",
"System.Net.NameResolution.dll",
"System.Net.NetworkInformation.dll",
"System.Net.Ping.dll",
"System.Net.Primitives.dll",
"System.Net.Requests.dll",
"System.Net.Security.dll",
"System.Net.Sockets.dll",
"System.Net.WebHeaderCollection.dll",
"System.Net.WebSockets.Client.dll",
"System.Net.WebSockets.dll",
"System.ObjectModel.dll",
"System.Reflection.dll",
"System.Reflection.Extensions.dll",
"System.Reflection.Metadata.dll",
"System.Reflection.Primitives.dll",
"System.Resources.Reader.dll",
"System.Resources.ResourceManager.dll",
"System.Resources.Writer.dll",
"System.Runtime.CompilerServices.VisualC.dll",
"System.Runtime.dll",
"System.Runtime.Extensions.dll",
"System.Runtime.Handles.dll",
"System.Runtime.InteropServices.dll",
"System.Runtime.InteropServices.RuntimeInformation.dll",
"System.Runtime.Numerics.dll",
"System.Runtime.Serialization.Formatters.dll",
"System.Runtime.Serialization.Json.dll",
"System.Runtime.Serialization.Primitives.dll",
"System.Runtime.Serialization.Xml.dll",
"System.Security.Claims.dll",
"System.Security.Cryptography.Algorithms.dll",
"System.Security.Cryptography.Csp.dll",
"System.Security.Cryptography.Encoding.dll",
"System.Security.Cryptography.Primitives.dll",
"System.Security.Cryptography.X509Certificates.dll",
"System.Security.Principal.dll",
"System.Security.SecureString.dll",
"System.Text.Encoding.dll",
"System.Text.Encoding.Extensions.dll",
"System.Text.RegularExpressions.dll",
"System.Threading.dll",
"System.Threading.Overlapped.dll",
"System.Threading.Tasks.dll",
"System.Threading.Tasks.Parallel.dll",
"System.Threading.Thread.dll",
"System.Threading.ThreadPool.dll",
"System.Threading.Timer.dll",
"System.ValueTuple.dll",
"System.Xml.ReaderWriter.dll",
"System.Xml.XDocument.dll",
"System.Xml.XmlDocument.dll",
"System.Xml.XmlSerializer.dll",
"System.Xml.XPath.dll",
"System.Xml.XPath.XDocument.dll"
]
}