huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update deps and fix VSIX signing 

So, it turns out the VSSDK added a feature that lets us suppress
assemblies brought in by package references. YAY!
This commit is contained in:
Ryan Nowak 2018-10-18 13:10:49 -07:00
parent 4927525519
commit 04eb1e677c
3 changed files with 5 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.props
View File

@ -4,7 +4,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="Package Versions"> <PropertyGroup Label="Package Versions">
<BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion> <BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
<InternalAspNetCoreSdkPackageVersion>3.0.0-alpha1-20180919.1</InternalAspNetCoreSdkPackageVersion> <InternalAspNetCoreSdkPackageVersion>3.0.0-alpha1-20181017.7</InternalAspNetCoreSdkPackageVersion>
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-alpha1-10549</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion> <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-alpha1-10549</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
<MicrosoftAspNetCoreHtmlAbstractionsPackageVersion>3.0.0-alpha1-10549</MicrosoftAspNetCoreHtmlAbstractionsPackageVersion> <MicrosoftAspNetCoreHtmlAbstractionsPackageVersion>3.0.0-alpha1-10549</MicrosoftAspNetCoreHtmlAbstractionsPackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>3.0.0-alpha1-10549</MicrosoftAspNetCoreTestingPackageVersion> <MicrosoftAspNetCoreTestingPackageVersion>3.0.0-alpha1-10549</MicrosoftAspNetCoreTestingPackageVersion>

4
korebuild-lock.txt
View File

@ -1,2 +1,2 @@
version:3.0.0-alpha1-20180919.1 version:3.0.0-alpha1-20181017.7
commithash:3066ae0a230870ea07e3f132605b5e5493f8bbd4 commithash:f4082c290c6c7610e7cb9d787072004453fc175f

39
tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
View File

@ -27,6 +27,7 @@
<IsProductComponent>true</IsProductComponent> <IsProductComponent>true</IsProductComponent>
<ImportDirectoryBuildProps>false</ImportDirectoryBuildProps> <ImportDirectoryBuildProps>false</ImportDirectoryBuildProps>
<ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets> <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
<IncludePackageReferencesInVSIXContainer>false</IncludePackageReferencesInVSIXContainer>
</PropertyGroup> </PropertyGroup>
<Import Project="..\..\version.props" /> <Import Project="..\..\version.props" />
<Import Project="..\..\build\sources.props" /> <Import Project="..\..\build\sources.props" />
@ -41,10 +42,6 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.VisualStudio.RazorExtension</RootNamespace> <RootNamespace>Microsoft.VisualStudio.RazorExtension</RootNamespace>
<AssemblyName>Microsoft.VisualStudio.RazorExtension</AssemblyName> <AssemblyName>Microsoft.VisualStudio.RazorExtension</AssemblyName>
<!--
We exclude some facade-only assemblies (i.e. assemblies without any implementation) from the VSIX using the SuppressFromVsix ItemGroup listed in this file.
The list is dependent on the framework being targeted. Changes to TargetFrameworkVersion would warrant rebuilding the SuppressFromVsix ItemGroup.
-->
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<GeneratePkgDefFile>true</GeneratePkgDefFile> <GeneratePkgDefFile>true</GeneratePkgDefFile>
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer> <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
@ -239,39 +236,7 @@
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="15.8.28010" /> <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="15.8.28010" />
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="15.8.3252" /> <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="15.8.3252" />
</ItemGroup> </ItemGroup>
<ItemDefinitionGroup>
<SuppressFromVsix>
<Visible>false</Visible>
</SuppressFromVsix>
</ItemDefinitionGroup>
<ItemGroup>
<SuppressFromVsix Include="Esent.Interop.dll" />
<SuppressFromVsix Include="Microsoft.CodeAnalysis.CSharp.EditorFeatures.dll" />
<SuppressFromVsix Include="Microsoft.CodeAnalysis.EditorFeatures.dll" />
<SuppressFromVsix Include="Microsoft.CodeAnalysis.EditorFeatures.Text.dll" />
<SuppressFromVsix Include="Microsoft.CodeAnalysis.Elfie.dll" />
<SuppressFromVsix Include="Microsoft.CodeAnalysis.Features.dll" />
<SuppressFromVsix Include="Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.dll" />
<SuppressFromVsix Include="System.AppContext.dll" />
<SuppressFromVsix Include="System.Console.dll" />
<SuppressFromVsix Include="System.Diagnostics.FileVersionInfo.dll" />
<SuppressFromVsix Include="System.Diagnostics.StackTrace.dll" />
<SuppressFromVsix Include="System.IO.Compression.dll" />
<SuppressFromVsix Include="System.IO.FileSystem.dll" />
<SuppressFromVsix Include="System.IO.FileSystem.Primitives.dll" />
<SuppressFromVsix Include="System.Runtime.InteropServices.RuntimeInformation.dll" />
<SuppressFromVsix Include="System.Security.Cryptography.Algorithms.dll" />
<SuppressFromVsix Include="System.Security.Cryptography.Encoding.dll" />
<SuppressFromVsix Include="System.Security.Cryptography.Primitives.dll" />
<SuppressFromVsix Include="System.Security.Cryptography.X509Certificates.dll" />
<SuppressFromVsix Include="System.Text.Encoding.CodePages.dll" />
<SuppressFromVsix Include="System.Threading.Thread.dll" />
<SuppressFromVsix Include="System.ValueTuple.dll" />
<SuppressFromVsix Include="System.Xml.ReaderWriter.dll" />
<SuppressFromVsix Include="System.Xml.XmlDocument.dll" />
<SuppressFromVsix Include="System.Xml.XPath.dll" />
<SuppressFromVsix Include="System.Xml.XPath.XDocument.dll" />
</ItemGroup>
<Target Name="CopySymbolsToOutput" AfterTargets="Build" Condition="'$(SymbolsPublishDir)' != ''"> <Target Name="CopySymbolsToOutput" AfterTargets="Build" Condition="'$(SymbolsPublishDir)' != ''">
<Copy SourceFiles="$(OutDir)$(AssemblyName).pdb" DestinationFolder="$(SymbolsPublishDir)" /> <Copy SourceFiles="$(OutDir)$(AssemblyName).pdb" DestinationFolder="$(SymbolsPublishDir)" />
</Target> </Target>