From 26dfce1f3c26c80bb3c677da127a6e9460e989f8 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 28 Nov 2018 15:29:25 -0800 Subject: [PATCH] Disable building src/Components and fix its code signing configuration (#4299) --- build/CodeSign.props | 2 +- build/artifacts.props | 18 +++--- build/buildorder.props | 2 +- build/submodules.props | 2 +- .../test/FunctionalTests/package-lock.json | 28 +++++++--- src/Components/.appveyor.yml | 28 ---------- .../.azure/pipelines/ci-official.yml | 27 --------- src/Components/.azure/pipelines/ci-public.yml | 10 ---- .../.azure/templates/blazor-build.yml | 55 ------------------- src/Components/.travis.yml | 39 ------------- src/Components/Directory.Build.props | 7 ++- src/Components/build/VSIX.targets | 2 +- src/Components/build/dependencies.props | 3 +- src/Components/build/repo.props | 9 --- src/Components/build/sources.props | 18 ++++++ src/Components/nuget.config | 11 ---- ...oft.AspNetCore.Components.Analyzers.csproj | 2 +- ...crosoft.AspNetCore.Components.Build.csproj | 32 ++++++++++- src/Razor/build/VSIX.targets | 4 +- 19 files changed, 91 insertions(+), 208 deletions(-) delete mode 100644 src/Components/.appveyor.yml delete mode 100644 src/Components/.azure/pipelines/ci-official.yml delete mode 100644 src/Components/.azure/pipelines/ci-public.yml delete mode 100644 src/Components/.azure/templates/blazor-build.yml delete mode 100644 src/Components/.travis.yml create mode 100644 src/Components/build/sources.props delete mode 100644 src/Components/nuget.config diff --git a/build/CodeSign.props b/build/CodeSign.props index 128ce33478..51721ed63b 100644 --- a/build/CodeSign.props +++ b/build/CodeSign.props @@ -1,7 +1,7 @@ - + diff --git a/build/artifacts.props b/build/artifacts.props index 500f659281..c2c6563c22 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -29,14 +29,16 @@ - - - - - - - - + + + diff --git a/build/buildorder.props b/build/buildorder.props index 22106b474e..9f5da11c61 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -29,7 +29,7 @@ - + diff --git a/build/submodules.props b/build/submodules.props index cf131fe697..070b259dd6 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -40,7 +40,7 @@ - + diff --git a/src/CORS/test/FunctionalTests/package-lock.json b/src/CORS/test/FunctionalTests/package-lock.json index 3db2468bdf..d9ea7ae2f6 100644 --- a/src/CORS/test/FunctionalTests/package-lock.json +++ b/src/CORS/test/FunctionalTests/package-lock.json @@ -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", diff --git a/src/Components/.appveyor.yml b/src/Components/.appveyor.yml deleted file mode 100644 index 7b60552f2f..0000000000 --- a/src/Components/.appveyor.yml +++ /dev/null @@ -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 diff --git a/src/Components/.azure/pipelines/ci-official.yml b/src/Components/.azure/pipelines/ci-official.yml deleted file mode 100644 index 2f5baa3fd4..0000000000 --- a/src/Components/.azure/pipelines/ci-official.yml +++ /dev/null @@ -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() diff --git a/src/Components/.azure/pipelines/ci-public.yml b/src/Components/.azure/pipelines/ci-public.yml deleted file mode 100644 index 9b77356d15..0000000000 --- a/src/Components/.azure/pipelines/ci-public.yml +++ /dev/null @@ -1,10 +0,0 @@ -trigger: -- master -- release/* - -phases: -- template: ../templates/blazor-build.yml - parameters: - queueName: Hosted VS2017 - variables: - SkipCodeSign: true diff --git a/src/Components/.azure/templates/blazor-build.yml b/src/Components/.azure/templates/blazor-build.yml deleted file mode 100644 index ca3b9245c8..0000000000 --- a/src/Components/.azure/templates/blazor-build.yml +++ /dev/null @@ -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 }} diff --git a/src/Components/.travis.yml b/src/Components/.travis.yml deleted file mode 100644 index 3af38e8b07..0000000000 --- a/src/Components/.travis.yml +++ /dev/null @@ -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 diff --git a/src/Components/Directory.Build.props b/src/Components/Directory.Build.props index e8b9aba15b..5329a315f9 100644 --- a/src/Components/Directory.Build.props +++ b/src/Components/Directory.Build.props @@ -6,9 +6,6 @@ $(MSBuildThisFileDirectory) aspnetcore;components - https://go.microsoft.com/fwlink/?LinkID=288859 - true - $(MSBuildThisFileDirectory)..\..\artifacts\build\ $(MSBuildThisFileDirectory)src\Microsoft.AspNetCore.Components.Build\bin\$(Configuration)\netcoreapp2.1\ @@ -21,4 +18,8 @@ false + + + + diff --git a/src/Components/build/VSIX.targets b/src/Components/build/VSIX.targets index 57a64de455..c75e047fd4 100644 --- a/src/Components/build/VSIX.targets +++ b/src/Components/build/VSIX.targets @@ -1,6 +1,6 @@  - true + false $(RestoreDependsOn);RestoreVSIX $(PackageDependsOn);PackageVSIX $(RepositoryRoot)blazor\tooling\Microsoft.VisualStudio.BlazorExtension\Microsoft.VisualStudio.BlazorExtension.csproj diff --git a/src/Components/build/dependencies.props b/src/Components/build/dependencies.props index 84f4d70a72..e69c1cf190 100644 --- a/src/Components/build/dependencies.props +++ b/src/Components/build/dependencies.props @@ -2,11 +2,12 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + 2.1.0 2.1.3 0.10.13 - 2.2.0-preview1-20181001.1 + 3.0.0-build-20181120.4 2.2.0-preview1-34576 2.1.2 2.1.2 diff --git a/src/Components/build/repo.props b/src/Components/build/repo.props index 15884cc600..ab109c204b 100644 --- a/src/Components/build/repo.props +++ b/src/Components/build/repo.props @@ -4,14 +4,6 @@ true - false - $(MSBuildThisFileDirectory)..\..\..\eng\signcheck.exclusions.txt - $(ArtifactsDir)\$(Configuration)\ - false - - - - true @@ -44,7 +36,6 @@ - diff --git a/src/Components/build/sources.props b/src/Components/build/sources.props new file mode 100644 index 0000000000..fd0526f6dc --- /dev/null +++ b/src/Components/build/sources.props @@ -0,0 +1,18 @@ + + + + + $(DotNetRestoreSources) + + $(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); + https://api.nuget.org/v3/index.json; + + + diff --git a/src/Components/nuget.config b/src/Components/nuget.config deleted file mode 100644 index 8b484fc40d..0000000000 --- a/src/Components/nuget.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Analyzers/Microsoft.AspNetCore.Components.Analyzers.csproj b/src/Components/src/Microsoft.AspNetCore.Components.Analyzers/Microsoft.AspNetCore.Components.Analyzers.csproj index ac47125333..11aff15c45 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Analyzers/Microsoft.AspNetCore.Components.Analyzers.csproj +++ b/src/Components/src/Microsoft.AspNetCore.Components.Analyzers/Microsoft.AspNetCore.Components.Analyzers.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj b/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj index 1864930d01..3144fe97cb 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj +++ b/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj @@ -16,9 +16,35 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Razor/build/VSIX.targets b/src/Razor/build/VSIX.targets index bc3460fd16..30704b8f62 100644 --- a/src/Razor/build/VSIX.targets +++ b/src/Razor/build/VSIX.targets @@ -18,8 +18,8 @@ Condition="'$(OS)'=='Windows_NT'" /> - - + + VsixPackage