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.

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

Arcade build scripts #31511

Merged
merged 9 commits into from
Dec 6, 2018
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ indent_size = 2
[*.json]
indent_size = 2

[*.{sh}]
end_of_line = lf
indent_size = 2

# Dotnet code style settings:
[*.{cs,vb}]
# Sort using and Import directives with System.* appearing first
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ x64/
[Oo]bj/
.dotnet/
.tools/
.packages/
tmat marked this conversation as resolved.
Show resolved Hide resolved

# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
!packages/*/build/
Expand Down
2 changes: 1 addition & 1 deletion Build.cmd
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@echo off
powershell -noprofile -executionPolicy RemoteSigned -file "%~dp0\build\scripts\build.ps1" -build %*
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build\scripts\build.ps1""" -build %*"
File renamed without changes.
3 changes: 1 addition & 2 deletions Restore.cmd
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
@echo off
powershell -noprofile -executionPolicy RemoteSigned -file "%~dp0\build\scripts\build.ps1" -restore %*

powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build\scripts\build.ps1""" -restore %*"
2 changes: 1 addition & 1 deletion Test.cmd
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@echo off
powershell -noprofile -executionPolicy RemoteSigned -file "%~dp0\build\scripts\build.ps1" -testDesktop %*
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build\scripts\build.ps1""" -test %*"
2 changes: 1 addition & 1 deletion azure-pipelines-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
timeoutInMinutes: 90

steps:
- script: build/scripts/cibuild.cmd -configuration $(_configuration) -testVsi
- script: build/scripts/cibuild.cmd -configuration $(_configuration) -prepareMachine -testVsi
displayName: Build and Test

- task: PublishTestResults@1
Expand Down
1 change: 0 additions & 1 deletion azure-pipelines-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ jobs:

- script: build\scripts\cibuild.cmd
-configuration $(BuildConfiguration) -official -testDesktop -procdump
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
/p:DotNetSignType=$(PB_SignType)
/p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
/p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
Expand Down
19 changes: 8 additions & 11 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
timeoutInMinutes: 90

steps:
- script: build/scripts/cibuild.cmd -configuration $(_configuration) -testDesktop -$(_testKind)
- script: build/scripts/cibuild.cmd -configuration $(_configuration) -prepareMachine -testDesktop -$(_testKind)
displayName: Build and Test

- task: PublishTestResults@1
Expand All @@ -44,7 +44,7 @@ jobs:
timeoutInMinutes: 90

steps:
- script: build/scripts/cibuild.cmd -configuration Debug -testDesktop
- script: build/scripts/cibuild.cmd -configuration Debug -prepareMachine -testDesktop
displayName: Build and Test

- task: PublishTestResults@1
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
timeoutInMinutes: 90

steps:
- script: build/scripts/cibuild.cmd -configuration $(_configuration) -testCoreClr -buildCoreClr
- script: build/scripts/cibuild.cmd -configuration $(_configuration) -prepareMachine -msbuildEngine:dotnet -testCoreClr
displayName: Build and Test

- task: PublishTestResults@1
Expand All @@ -99,7 +99,7 @@ jobs:
pool: dotnet-external-temp
timeoutInMinutes: 90
steps:
- script: build/scripts/cibuild.cmd -testDeterminism
- script: build/scripts/test-determinism.cmd -configuration Debug
displayName: Build - Validate determinism

- task: PublishBuildArtifacts@1
Expand All @@ -115,7 +115,7 @@ jobs:
pool: dotnet-external-temp
timeoutInMinutes: 90
steps:
- script: build/scripts/test-build-correctness.cmd -configuration Release -cibuild
- script: build/scripts/test-build-correctness.cmd -configuration Release
displayName: Build - Validate correctness

- task: PublishBuildArtifacts@1
Expand All @@ -133,19 +133,16 @@ jobs:
maxParallel: 2
matrix:
coreclr:
_args: --configuration Debug
_args: --testCoreClr
_name: CoreClr
_configuration: Debug
mono:
_args: --configuration Debug --docker --mono
_args: --testMono --docker
_name: Mono
timeoutInMinutes: 90
steps:
- script: ./build/scripts/cibuild.sh $(_args)
- script: ./build/scripts/cibuild.sh --configuration $(_configuration) --prepareMachine $(_args)
displayName: Build and Test
- script: ./build/scripts/dockerstop.sh
displayName: Stop Docker
condition: eq(variables['_name'], 'Mono')
- task: PublishTestResults@1
inputs:
testRunner: XUnit
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ while [[ -h $source ]]; do
done

scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
"$scriptroot/build/scripts/build.sh" $@
"$scriptroot/build/scripts/build.sh" --build $@
14 changes: 0 additions & 14 deletions build/Targets/FixedPackages.props

This file was deleted.

36 changes: 0 additions & 36 deletions build/Targets/Imports.targets
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,9 @@
</Target>

<PropertyGroup>
<PrepareForBuildDependsOn>RestoreToolsetCheck;$(PrepareForBuildDependsOn)</PrepareForBuildDependsOn>
<TargetFrameworkMonikerAssemblyAttributesPath>$(IntermediateOutputPath)$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)</TargetFrameworkMonikerAssemblyAttributesPath>
</PropertyGroup>

<Target Name="RestoreToolsetCheck" Condition="'$(BuildingProject)' == 'true' AND '$(DotNetBuildFromSource)' != 'true'">
<Error Text="Toolset packages have not been restored, run Restore.cmd before building. Expected '$(RoslynToolsetPropsFilePath)' to exist."
Condition="!Exists('$(RoslynToolsetPropsFilePath)')" />
</Target>

<Target Name="CheckBootstrapState"
Condition="'$(BootstrapBuildPath)' != ''"
AfterTargets="CoreCompile">
Expand Down Expand Up @@ -184,36 +178,6 @@
<None Include="@(Resource)" />
</ItemGroup>

<!--
Prepare inputs for Symbol Store publishing.

The imported targets populate ArtifactsSymStoreDirectory with links to binaries and Windows PDBs produced either
directly by the build or converted from Portable PDBs produced by the build.
In official build the content of ArtifactsSymStoreDirectory is uploaded to a symbol server.
-->
<PropertyGroup>
<PublishOutputToSymStore Condition="'$(IsShipping)' != 'true'">false</PublishOutputToSymStore>
</PropertyGroup>

<!--
Workaround for not having VS 15.7 on build machines.
Remove when machines are upgraded.
-->
<Target Name="InitializeSourceControlInformation" />
<PropertyGroup>
<SourceControlInformationFeatureSupported>true</SourceControlInformationFeatureSupported>
</PropertyGroup>

<!--
Triggered from Jenkins localization validation leg.
Delegates to XliffTasks to validate that all localizable resources have been translated.
We can't use EnsureAllResoucesTranslated directly because the XliffTasks package is only pulled in by projects that
produce shipping binaries.
-->
<Target Name="CheckLocStatus"
DependsOnTargets="EnsureAllResourcesTranslated"
Condition="'$(IsShipping)' == 'true'" />

<!--
Add ThirdPartyNotices.rtf to all shipping NuGet packages.
-->
Expand Down
Loading