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

Disable building src/Components and fix its code signing configuration (#4299)

This commit is contained in:
Nate McMaster 2018-11-28 15:29:25 -08:00 committed by GitHub
parent 8a37389a9f
commit 26dfce1f3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 91 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/CodeSign.props
View File

@ -1,7 +1,7 @@
<Project>
<ItemGroup>
<!-- Third-party components in Microsoft.AspNetCore.App which should be signed. -->
<!-- Third-party components which should be signed. -->
<!-- Microsoft.AspNetCore.App -->
<FilesToSign Include="Newtonsoft.Json.dll" Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Newtonsoft.Json.Bson.dll" Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.App" />

18
build/artifacts.props
View File

@ -29,14 +29,16 @@
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.WsFederation" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Blazor.Cli" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Blazor.Templates" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Components" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Components.Analyzers" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Components.Browser" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Components.Build" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Components.Razor.Extensions" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Components.Server" Category="ship" />
<!-- <PackageArtifact Include="Microsoft.AspNetCore.Blazor.Cli" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.Blazor.Templates" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.Components" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.Components.Analyzers" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.Components.Browser" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.Components.Build" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.Components.Razor.Extensions" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.Components.Server" Category="noship" /> -->
<PackageArtifact Include="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.DataProtection.AzureStorage" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Category="ship" />

2
build/buildorder.props
View File

@ -29,7 +29,7 @@
<RepositoryBuildOrder Include="MusicStore" Order="16" RootPath="$(RepositoryRoot)src\MusicStore\" />
<RepositoryBuildOrder Include="SignalR" Order="16" RootPath="$(RepositoryRoot)src\SignalR\" />
<RepositoryBuildOrder Include="AuthSamples" Order="16" RootPath="$(RepositoryRoot)src\AuthSamples\" />
<RepositoryBuildOrder Include="Components" Order="17" RootPath="$(RepositoryRoot)src\Components\" />
<!-- <RepositoryBuildOrder Include="Components" Order="17 RootPath="$(RepositoryRoot)src\Components\" /> -->
<RepositoryBuildOrder Include="Templating" Order="18" RootPath="$(RepositoryRoot)src\Templating\" />
</ItemGroup>
</Project>

2
build/submodules.props
View File

@ -40,7 +40,7 @@
<Repository Include="Antiforgery" RootPath="$(RepositoryRoot)src\Antiforgery\" />
<Repository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
<Repository Include="BasicMiddleware" />
<Repository Include="Components" RootPath="$(RepositoryRoot)src\Components\" />
<!-- <Repository Include="Components" RootPath="$(RepositoryRoot)src\Components\" /> -->
<Repository Include="CORS" RootPath="$(RepositoryRoot)src\CORS\" />
<Repository Include="HttpSysServer" RootPath="$(RepositoryRoot)src\HttpSysServer\" />
<Repository Include="Identity" />

28
src/CORS/test/FunctionalTests/package-lock.json generated
View File

@ -1689,12 +1689,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@ -1709,17 +1711,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
@ -1836,7 +1841,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
@ -1848,6 +1854,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@ -1862,6 +1869,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@ -1869,12 +1877,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
@ -1893,6 +1903,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@ -1973,7 +1984,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
@ -1985,6 +1997,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@ -2106,6 +2119,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",

28
src/Components/.appveyor.yml
View File

@ -1,28 +0,0 @@
init:
- git config --global core.autocrlf true
install:
- git submodule update --init --recursive
- ps: Install-Product node 10 x64
branches:
only:
- master
- /^release\/.*$/
- /^(.*\/)?ci-.*$/
environment:
global:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
DOTNET_CLI_TELEMETRY_OPTOUT: 1
test: 'off'
deploy: 'off'
os: Visual Studio 2017 Preview
build_script:
- build.cmd -ci /p:SkipTests=true /p:BlazorOutputStatistics=true
before_test:
- choco install googlechrome --ignore-checksum
- npm install -g selenium-standalone@latest
- selenium-standalone install
- ps: $SeleniumProcess = Start-Process "selenium-standalone" -ArgumentList "start" -PassThru
test_script:
- build.cmd -ci /t:Test /p:BlazorAllTests=true /p:BlazorOutputStatistics=true
after_test:
- ps: Stop-Process -Id $SeleniumProcess.Id

27
src/Components/.azure/pipelines/ci-official.yml
View File

@ -1,27 +0,0 @@
trigger:
- master
- release/*
phases:
- template: ../templates/blazor-build.yml
parameters:
queueName: DotNetCore-Windows
variables:
SignType: real
TeamName: AspNetCore
beforeBuild:
- task: securedevelopmentteam.vss-secure-development-tools.build-task-policheck.PoliCheck@1
displayName: 'Run compliance check'
inputs:
targetType: F
- task: MicroBuildSigningPlugin@1
displayName: Install CodeSigning plugin
inputs:
signType: $(SignType)
zipSources: false
condition: and(succeeded(), in(variables['SignType'], 'test', 'real'))
afterBuild:
- task: MicroBuildCleanup@1
displayName: Perform Cleanup Tasks
condition: succeededOrFailed()

10
src/Components/.azure/pipelines/ci-public.yml
View File

@ -1,10 +0,0 @@
trigger:
- master
- release/*
phases:
- template: ../templates/blazor-build.yml
parameters:
queueName: Hosted VS2017
variables:
SkipCodeSign: true

55
src/Components/.azure/templates/blazor-build.yml
View File

@ -1,55 +0,0 @@
parameters:
queueName: ''
beforeBuild: []
afterBuild: []
variables:
phases:
- phase: Windows
queue:
name: ${{ parameters.queueName }}
parallel: 2
matrix:
Release:
BuildConfiguration: Release
Debug:
BuildConfiguration: Debug
variables:
${{ insert }}: ${{ parameters.variables }}
steps:
- task: NodeTool@0
inputs:
versionSpec: '10.13.0'
- checkout: self
clean: true
- ${{ parameters.beforeBuild }}
- script: .\build.cmd -ci /p:Configuration=$(BuildConfiguration)
displayName: Run build.cmd
- task: PublishTestResults@2
displayName: Publish test results
condition: always()
inputs:
testRunner: vstest
testResultsFiles: 'artifacts/logs/**/*.trx'
- task: PublishBuildArtifacts@1
displayName: Upload artifacts
condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
inputs:
pathtoPublish: artifacts/$(BuildConfiguration)/
artifactName: artifacts-$(BuildConfiguration)
artifactType: Container
- task: PublishBuildArtifacts@1
displayName: Upload logs
condition: and(failed(), eq(variables['system.pullrequest.isfork'], false))
inputs:
pathtoPublish: artifacts/logs/
artifactName: logs-$(BuildConfiguration)
artifactType: Container
- ${{ parameters.afterBuild }}

39
src/Components/.travis.yml
View File

@ -1,39 +0,0 @@
language: csharp
sudo: required
dist: trusty
env:
global:
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
- DOTNET_CLI_TELEMETRY_OPTOUT: 1
addons:
apt:
packages:
- libunwind8
chrome: stable
mono: none
os:
- linux
- osx
osx_image: xcode8.2
branches:
only:
- master
- /^release\/.*$/
- /^(.*\/)?ci-.*$/
before_install:
- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s
/usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib
/usr/local/lib/; fi
install:
- . $HOME/.nvm/nvm.sh
- nvm install 10.13.0
- nvm use 10.13.0
- npm install -g selenium-standalone
- selenium-standalone install
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TEST_CHROME_BINARY=`which google-chrome-stable`; fi
- export DOTNET_INSTALL_DIR="$PWD/.dotnet"
- export PATH="$DOTNET_INSTALL_DIR:$PATH"
script:
- ./build.sh --ci /p:SkipTests=true /p:BlazorOutputStatistics=true
- selenium-standalone start &
- ./build.sh --ci /t:Test /p:BlazorAllTests=true

7
src/Components/Directory.Build.props
View File

@ -6,9 +6,6 @@
<PropertyGroup>
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
<PackageTags>aspnetcore;components</PackageTags>
<PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageOutputPath>$(MSBuildThisFileDirectory)..\..\artifacts\build\</PackageOutputPath>
<!-- So we can use the tool from source within the repo without having to pack -->
<BlazorToolsDir>$(MSBuildThisFileDirectory)src\Microsoft.AspNetCore.Components.Build\bin\$(Configuration)\netcoreapp2.1\</BlazorToolsDir>
@ -21,4 +18,8 @@
<AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
</ItemGroup>
</Project>

2
src/Components/build/VSIX.targets
View File

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<BuildVSIX Condition="'$(BuildVSIX)' ==''">true</BuildVSIX>
<BuildVSIX Condition="'$(BuildVSIX)' ==''">false</BuildVSIX>
<RestoreDependsOn Condition="'$(OS)'=='Windows_NT' AND '$(BuildVSIX)' == 'true'">$(RestoreDependsOn);RestoreVSIX</RestoreDependsOn>
<PackageDependsOn Condition="'$(OS)'=='Windows_NT' AND '$(BuildVSIX)' == 'true'">$(PackageDependsOn);PackageVSIX</PackageDependsOn>
<VSIXProject>$(RepositoryRoot)blazor\tooling\Microsoft.VisualStudio.BlazorExtension\Microsoft.VisualStudio.BlazorExtension.csproj</VSIXProject>

3
src/Components/build/dependencies.props
View File

@ -2,11 +2,12 @@
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
<PropertyGroup Label="Package Versions"><!-- Used only in development when running the template contents directly from source -->
<AspNetCorePackageVersion>2.1.0</AspNetCorePackageVersion>
<AspNetCoreRuntimeVersion>2.1.3</AspNetCoreRuntimeVersion>
<BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
<InternalAspNetCoreSdkPackageVersion>2.2.0-preview1-20181001.1</InternalAspNetCoreSdkPackageVersion>
<InternalAspNetCoreSdkPackageVersion>3.0.0-build-20181120.4</InternalAspNetCoreSdkPackageVersion>
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>2.2.0-preview1-34576</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.1.2</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftAspNetCoreRazorDesignPackageVersion>2.1.2</MicrosoftAspNetCoreRazorDesignPackageVersion>

9
src/Components/build/repo.props
View File

@ -4,14 +4,6 @@
<!-- Properties to make KoreBuild more like dotnet/arcade. -->
<PropertyGroup>
<SkipArtifactVerification>true</SkipArtifactVerification>
<EnableBenchmarkValidation>false</EnableBenchmarkValidation>
<SignCheckExclusionsFile>$(MSBuildThisFileDirectory)..\..\..\eng\signcheck.exclusions.txt</SignCheckExclusionsFile>
<SignToolDataWorkingDir>$(ArtifactsDir)\$(Configuration)\</SignToolDataWorkingDir>
<OverridePackageOutputPath>false</OverridePackageOutputPath>
</PropertyGroup>
<PropertyGroup>
<EnableBenchmarkValidation>true</EnableBenchmarkValidation>
</PropertyGroup>
<PropertyGroup>
@ -44,7 +36,6 @@
</ItemGroup>
<ItemGroup>
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
</ItemGroup>

18
src/Components/build/sources.props Normal file
View File

@ -0,0 +1,18 @@
<Project>
<Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
<PropertyGroup Label="RestoreSources">
<RestoreSources>$(DotNetRestoreSources)</RestoreSources>
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
$(RestoreSources);
https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
https://dotnet.myget.org/f/blazor-dev/api/v3/index.json;
</RestoreSources>
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
$(RestoreSources);
https://api.nuget.org/v3/index.json;
</RestoreSources>
</PropertyGroup>
</Project>

11
src/Components/nuget.config
View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="myget.org aspnetcore-dev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
<add key="myget.org aspnetcore-tools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
<add key="myget.org blazor-dev" value="https://dotnet.myget.org/f/blazor-dev/api/v3/index.json" />
</packageSources>
</configuration>

2
src/Components/src/Microsoft.AspNetCore.Components.Analyzers/Microsoft.AspNetCore.Components.Analyzers.csproj
View File

@ -15,7 +15,7 @@
<ItemGroup>
<None Include="$(TargetPath)" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
<SignedPackageFile Include="$(TargetPath)" Certificate="3PartySHA2" />
<SignedPackageFile Include="$(TargetPath)" Certificate="$(AssemblySigningCertName)" />
</ItemGroup>
<ItemGroup>

32
src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj
View File

@ -16,9 +16,35 @@
</PropertyGroup>
<ItemGroup>
<SignedPackageFile Include="$(PublishDir)\**\Microsoft.AspNetCore.Components.Build.exe" Certificate="3PartySHA2" />
<ExcludePackageFileFromSigning Include="$(PublishDir)\**\*.dll" Exclude="$(PublishDir)\**\Microsoft.AspNetCore.Components.dll;$(PublishDir)\**\Microsoft.AspNetCore.Components.Razor.Extensions.dll;" />
<ExcludePackageFileFromSigning Include="..\Microsoft.AspNetCore.Components.Browser.JS\dist\blazor.*.js" />
<!-- Assemblies built by this project -->
<SignedPackageFile Include="$(TargetFileName)" Certificate="$(AssemblySigningCertName)" />
<SignedPackageFile Include="Microsoft.AspNetCore.Components.TagHelperWorkaround.dll" Certificate="$(AssemblySigningCertName)" />
<SignedPackageFile Include="Microsoft.AspNetCore.Components.Browser.JS.dll" Certificate="$(AssemblySigningCertName)" />
<SignedPackageFile Include="Microsoft.AspNetCore.Components.Build.exe" Certificate="$(AssemblySigningCertName)" />
<!-- 3rd party assemblies we redistribute. -->
<SignedPackageFile Include="AngleSharp.dll" Certificate="$(AssemblySigning3rdPartyCertName)" />
<SignedPackageFile Include="Mono.Cecil.dll" Certificate="$(AssemblySigning3rdPartyCertName)" />
<SignedPackageFile Include="Mono.Cecil.Mdb.dll" Certificate="$(AssemblySigning3rdPartyCertName)" />
<SignedPackageFile Include="Mono.Cecil.Pdb.dll" Certificate="$(AssemblySigning3rdPartyCertName)" />
<SignedPackageFile Include="Mono.Cecil.Rocks.dll" Certificate="$(AssemblySigning3rdPartyCertName)" />
<!-- Assemblies which should be signed by other build. -->
<ExcludePackageFileFromSigning Include="Microsoft.AspNetCore.Razor.Language.dll" />
<ExcludePackageFileFromSigning Include="Microsoft.CodeAnalysis.CSharp.dll" />
<ExcludePackageFileFromSigning Include="Microsoft.CodeAnalysis.dll" />
<ExcludePackageFileFromSigning Include="Microsoft.CodeAnalysis.Razor.dll" />
<ExcludePackageFileFromSigning Include="Microsoft.Extensions.CommandLineUtils.dll" />
<ExcludePackageFileFromSigning Include="Microsoft.Extensions.FileProviders.Abstractions.dll" />
<ExcludePackageFileFromSigning Include="Microsoft.Extensions.FileProviders.Composite.dll" />
<ExcludePackageFileFromSigning Include="Microsoft.Extensions.FileProviders.Embedded.dll" />
<ExcludePackageFileFromSigning Include="Microsoft.Extensions.FileProviders.Physical.dll" />
<ExcludePackageFileFromSigning Include="Microsoft.Extensions.FileSystemGlobbing.dll" />
<ExcludePackageFileFromSigning Include="Microsoft.Extensions.Primitives.dll" />
<ExcludePackageFileFromSigning Include="Microsoft.JSInterop.dll" />
<ExcludePackageFileFromSigning Include="System.CodeDom.dll" />
<ExcludePackageFileFromSigning Include="System.Runtime.CompilerServices.Unsafe.dll" />
<ExcludePackageFileFromSigning Include="System.Text.Encoding.CodePages.dll" />
</ItemGroup>
<!-- Executes /t:Publish for all target frameworks before packing-->

4
src/Razor/build/VSIX.targets
View File

@ -18,8 +18,8 @@
Condition="'$(OS)'=='Windows_NT'" />
<!-- This target is required so KoreBuild can generate a bill of materials with relevant information about the VSIX. -->
<Target Name="GetVSIXArtifactInfo">
<ItemGroup>
<Target Name="GetVSIXArtifactInfo" DependsOnTargets="GetToolsets">
<ItemGroup Condition="'$(VisualStudioMSBuildx86Path)' != ''">
<ArtifactInfo Include="$(VSIXOutputPath)">
<ArtifactType>VsixPackage</ArtifactType>