From b4dbbdcf35514378511db10a428e8d0ed27d9069 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 27 Nov 2018 18:58:34 +0000 Subject: [PATCH] Components merge CR feedback --- src/Components/blazor/version.props | 2 +- src/Components/build/SignToolData.json | 248 ------------------------- src/Components/build/arcade.props | 2 +- src/Components/korebuild.json | 2 +- 4 files changed, 3 insertions(+), 251 deletions(-) delete mode 100644 src/Components/build/SignToolData.json diff --git a/src/Components/blazor/version.props b/src/Components/blazor/version.props index e5dcf58dde..5f84a3dab6 100644 --- a/src/Components/blazor/version.props +++ b/src/Components/blazor/version.props @@ -5,7 +5,7 @@ to include the new version in its upper bounds --> false 0.8.0 - preview1 + preview $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final diff --git a/src/Components/build/SignToolData.json b/src/Components/build/SignToolData.json deleted file mode 100644 index 107916826f..0000000000 --- a/src/Components/build/SignToolData.json +++ /dev/null @@ -1,248 +0,0 @@ -{ - "sign": [ - { - "certificate": "Microsoft400", - "values": [ - "bin/Microsoft.AspNetCore.Components.Analyzers/netstandard1.3/Microsoft.AspNetCore.Components.Analyzers.dll", - "bin/Microsoft.AspNetCore.Components.Browser.JS/netcoreapp2.1/Microsoft.AspNetCore.Components.Browser.JS.dll", - "bin/Microsoft.AspNetCore.Components.Browser/netstandard2.0/Microsoft.AspNetCore.Components.Browser.dll", - "bin/Microsoft.AspNetCore.Components.Server/netstandard2.0/Microsoft.AspNetCore.Components.Server.dll", - "bin/Microsoft.AspNetCore.Components.TagHelperWorkaround/netstandard1.0/Microsoft.AspNetCore.Components.TagHelperWorkaround.dll", - "bin/Microsoft.AspNetCore.Components.Build/netcoreapp2.1/Microsoft.AspNetCore.Components.Build.dll", - "bin/Microsoft.AspNetCore.Blazor.Cli/netcoreapp2.1/dotnet-blazor.dll", - "bin/Microsoft.AspNetCore.Components.Razor.Extensions/net461/Microsoft.AspNetCore.Components.Razor.Extensions.dll", - "bin/Microsoft.AspNetCore.Components.Razor.Extensions/netstandard2.0/Microsoft.AspNetCore.Components.Razor.Extensions.dll", - "bin/Microsoft.AspNetCore.Components/netstandard2.0/Microsoft.AspNetCore.Components.dll", - "bin/Microsoft.VisualStudio.BlazorExtension/Microsoft.VisualStudio.BlazorExtension.dll", - "bin/Microsoft.VisualStudio.LanguageServices.Blazor/net461/Microsoft.VisualStudio.LanguageServices.Blazor.dll" - ] - }, - { - "certificate": "3PartySHA2", - "values": [ - "bin/Microsoft.AspNetCore.Components.Build/netcoreapp2.1/AngleSharp.dll", - "bin/Microsoft.VisualStudio.BlazorExtension/AngleSharp.dll" - ] - }, - { - "certificate": "VsixSHA2", - "values": [ - "bin/Microsoft.VisualStudio.BlazorExtension/Microsoft.VisualStudio.BlazorExtension.vsix" - ] - }, - { - "certificate": "NuGet", - "strongName": null, - "values": [ - "packages/*.nupkg" - ] - } - ], - "exclude": [ - "illink.dll", - "Microsoft.AspNetCore.Razor.Language.dll", - "Microsoft.CodeAnalysis.dll", - "Microsoft.CodeAnalysis.CSharp.dll", - "Microsoft.CodeAnalysis.Razor.dll", - "Microsoft.Extensions.CommandLineUtils.dll", - "Microsoft.Extensions.FileProviders.Abstractions.dll", - "Microsoft.Extensions.FileProviders.Composite.dll", - "Microsoft.Extensions.FileProviders.Embedded.dll", - "Microsoft.Extensions.FileProviders.Physical.dll", - "Microsoft.Extensions.FileSystemGlobbing.dll", - "Microsoft.Extensions.Primitives.dll", - "Microsoft.JSInterop.dll", - "Mono.Cecil.dll", - "Mono.Cecil.Mdb.dll", - "Mono.Cecil.Pdb.dll", - "Mono.Cecil.Rocks.dll", - "I18N.CJK.dll", - "I18N.dll", - "I18N.MidEast.dll", - "I18N.Other.dll", - "I18N.Rare.dll", - "I18N.West.dll", - "Microsoft.CSharp.dll", - "Microsoft.Win32.Primitives.dll", - "Microsoft.Win32.Registry.AccessControl.dll", - "Microsoft.Win32.Registry.dll", - "Mono.CSharp.dll", - "Mono.Data.Sqlite.dll", - "Mono.Data.Tds.dll", - "Mono.Security.dll", - "mscorlib.dll", - "netstandard.dll", - "System.AppContext.dll", - "System.Buffers.dll", - "System.CodeDom.dll", - "System.Collections.Concurrent.dll", - "System.Collections.dll", - "System.Collections.NonGeneric.dll", - "System.Collections.Specialized.dll", - "System.ComponentModel.Annotations.dll", - "System.ComponentModel.Composition.dll", - "System.ComponentModel.DataAnnotations.dll", - "System.ComponentModel.dll", - "System.ComponentModel.EventBasedAsync.dll", - "System.ComponentModel.Primitives.dll", - "System.ComponentModel.TypeConverter.dll", - "System.Console.dll", - "System.Core.dll", - "System.Data.Common.dll", - "System.Data.dll", - "System.Data.Services.Client.dll", - "System.Data.SqlClient.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.TraceEvent.dll", - "System.Diagnostics.TraceSource.dll", - "System.Diagnostics.Tracing.dll", - "System.dll", - "System.Drawing.Common.dll", - "System.Drawing.dll", - "System.Drawing.Primitives.dll", - "System.Dynamic.Runtime.dll", - "System.Globalization.Calendars.dll", - "System.Globalization.dll", - "System.Globalization.Extensions.dll", - "System.IdentityModel.dll", - "System.IO.Compression.dll", - "System.IO.Compression.FileSystem.dll", - "System.IO.Compression.ZipFile.dll", - "System.IO.dll", - "System.IO.FileSystem.AccessControl.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.Json.dll", - "System.Linq.dll", - "System.Linq.Expressions.dll", - "System.Linq.Parallel.dll", - "System.Linq.Queryable.dll", - "System.Memory.dll", - "System.Net.AuthenticationManager.dll", - "System.Net.Cache.dll", - "System.Net.dll", - "System.Net.Http.dll", - "System.Net.Http.WinHttpHandler.dll", - "System.Net.HttpListener.dll", - "System.Net.Mail.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.ServicePoint.dll", - "System.Net.Sockets.dll", - "System.Net.Utilities.dll", - "System.Net.WebHeaderCollection.dll", - "System.Net.WebSockets.Client.dll", - "System.Net.WebSockets.dll", - "System.Numerics.dll", - "System.Numerics.Vectors.dll", - "System.ObjectModel.dll", - "System.Reflection.Context.dll", - "System.Reflection.DispatchProxy.dll", - "System.Reflection.dll", - "System.Reflection.Emit.dll", - "System.Reflection.Emit.ILGeneration.dll", - "System.Reflection.Emit.Lightweight.dll", - "System.Reflection.Extensions.dll", - "System.Reflection.Primitives.dll", - "System.Reflection.TypeExtensions.dll", - "System.Resources.Reader.dll", - "System.Resources.ReaderWriter.dll", - "System.Resources.ResourceManager.dll", - "System.Resources.Writer.dll", - "System.Runtime.CompilerServices.Unsafe.dll", - "System.Runtime.CompilerServices.Unsafe.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.InteropServices.WindowsRuntime.dll", - "System.Runtime.Loader.dll", - "System.Runtime.Numerics.dll", - "System.Runtime.Serialization.dll", - "System.Runtime.Serialization.Formatters.dll", - "System.Runtime.Serialization.Json.dll", - "System.Runtime.Serialization.Primitives.dll", - "System.Runtime.Serialization.Xml.dll", - "System.Security.AccessControl.dll", - "System.Security.Claims.dll", - "System.Security.Cryptography.Algorithms.dll", - "System.Security.Cryptography.Cng.dll", - "System.Security.Cryptography.Csp.dll", - "System.Security.Cryptography.DeriveBytes.dll", - "System.Security.Cryptography.Encoding.dll", - "System.Security.Cryptography.Encryption.Aes.dll", - "System.Security.Cryptography.Encryption.dll", - "System.Security.Cryptography.Encryption.ECDiffieHellman.dll", - "System.Security.Cryptography.Encryption.ECDsa.dll", - "System.Security.Cryptography.Hashing.Algorithms.dll", - "System.Security.Cryptography.Hashing.dll", - "System.Security.Cryptography.OpenSsl.dll", - "System.Security.Cryptography.Pkcs.dll", - "System.Security.Cryptography.Primitives.dll", - "System.Security.Cryptography.ProtectedData.dll", - "System.Security.Cryptography.RandomNumberGenerator.dll", - "System.Security.Cryptography.RSA.dll", - "System.Security.Cryptography.X509Certificates.dll", - "System.Security.dll", - "System.Security.Principal.dll", - "System.Security.Principal.Windows.dll", - "System.Security.SecureString.dll", - "System.ServiceModel.dll", - "System.ServiceModel.Duplex.dll", - "System.ServiceModel.Http.dll", - "System.ServiceModel.Internals.dll", - "System.ServiceModel.NetTcp.dll", - "System.ServiceModel.Primitives.dll", - "System.ServiceModel.Security.dll", - "System.ServiceModel.Web.dll", - "System.ServiceProcess.ServiceController.dll", - "System.Text.Encoding.CodePages.dll", - "System.Text.Encoding.CodePages.dll", - "System.Text.Encoding.CodePages.dll", - "System.Text.Encoding.dll", - "System.Text.Encoding.Extensions.dll", - "System.Text.RegularExpressions.dll", - "System.Threading.AccessControl.dll", - "System.Threading.dll", - "System.Threading.Tasks.Extensions.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.Transactions.dll", - "System.ValueTuple.dll", - "System.Web.Services.dll", - "System.Windows.dll", - "System.Xml.dll", - "System.Xml.Linq.dll", - "System.Xml.ReaderWriter.dll", - "System.Xml.Serialization.dll", - "System.Xml.XDocument.dll", - "System.Xml.XmlDocument.dll", - "System.Xml.XmlSerializer.dll", - "System.Xml.XPath.dll", - "System.Xml.XPath.XDocument.dll", - "System.Xml.XPath.XmlDocument.dll", - "System.Xml.Xsl.Primitives.dll" - ] -} \ No newline at end of file diff --git a/src/Components/build/arcade.props b/src/Components/build/arcade.props index 0871eebb4d..6f7432c583 100644 --- a/src/Components/build/arcade.props +++ b/src/Components/build/arcade.props @@ -17,7 +17,7 @@ This files is a temporary while this project transitions to using arcade. $(ArtifactsDir)obj\ $(ArtifactsDir)$(Configuration)\ $(ArtifactsConfigurationDir)bin\ - $(ArtifactsConfigurationDir)packages\ + $(ArtifactsDir)build\ diff --git a/src/Components/korebuild.json b/src/Components/korebuild.json index dc41efc753..1770aaf9fc 100644 --- a/src/Components/korebuild.json +++ b/src/Components/korebuild.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json", - "channel": "release/2.2", + "channel": "master", "toolsets": { "visualstudio": { "required": false,