Format Build related files
Normalize Tabs into Spaces Clean-up trailing white-spaces Fix-up new-lines where necessary
This commit is contained in:
Родитель
9e6708fe71
Коммит
8d18fcba9c
|
@ -17,7 +17,7 @@
|
|||
#
|
||||
# Merging from the command prompt will add diff markers to the files if there
|
||||
# are conflicts (Merging from VS is not affected by the settings below, in VS
|
||||
# the diff markers are never inserted). Diff markers may cause the following
|
||||
# the diff markers are never inserted). Diff markers may cause the following
|
||||
# file extensions to fail to load in VS. An alternative would be to treat
|
||||
# these files as binary and thus will always conflict and require user
|
||||
# intervention with every merge. To do so, just uncomment the entries below
|
||||
|
@ -46,9 +46,9 @@
|
|||
|
||||
###############################################################################
|
||||
# diff behavior for common document formats
|
||||
#
|
||||
#
|
||||
# Convert binary document formats to text before diffing them. This feature
|
||||
# is only available from the command line. Turn it on by uncommenting the
|
||||
# is only available from the command line. Turn it on by uncommenting the
|
||||
# entries below.
|
||||
###############################################################################
|
||||
#*.doc diff=astextplain
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<RunSettings>
|
||||
<MSTest>
|
||||
<MaxCpuCount>0</MaxCpuCount>
|
||||
<MaxCpuCount>0</MaxCpuCount>
|
||||
<Parallelize>
|
||||
<Workers>0</Workers>
|
||||
<Scope>ClassLevel</Scope>
|
||||
|
|
|
@ -11,14 +11,14 @@ pr:
|
|||
pool:
|
||||
vmImage: windows-2019
|
||||
|
||||
variables:
|
||||
variables:
|
||||
BuildConfiguration: Release
|
||||
|
||||
jobs:
|
||||
### BUILD ###
|
||||
- job: BuildBits
|
||||
timeoutInMinutes: 60
|
||||
|
||||
|
||||
steps:
|
||||
- task: BatchScript@1
|
||||
inputs:
|
||||
|
@ -32,7 +32,7 @@ jobs:
|
|||
inputs:
|
||||
versionSpec: 5.6.0
|
||||
|
||||
- task: DotNetCoreCLI@2
|
||||
- task: DotNetCoreCLI@2
|
||||
inputs:
|
||||
command: custom
|
||||
custom: tool
|
||||
|
@ -49,7 +49,7 @@ jobs:
|
|||
displayName: Build
|
||||
|
||||
### Unit Tests ###
|
||||
|
||||
|
||||
- powershell: .\build\build.ps1 -target=Test
|
||||
displayName: Test
|
||||
|
||||
|
@ -105,7 +105,7 @@ jobs:
|
|||
- job: SmokeTests
|
||||
dependsOn: BuildBits
|
||||
timeoutInMinutes: 60
|
||||
|
||||
|
||||
steps:
|
||||
- task: DownloadPipelineArtifact@2
|
||||
displayName: Download NuGet Packages Artifact
|
||||
|
@ -113,7 +113,7 @@ jobs:
|
|||
artifact: Packages
|
||||
path: .\bin\nupkg
|
||||
|
||||
- task: DotNetCoreCLI@2
|
||||
- task: DotNetCoreCLI@2
|
||||
inputs:
|
||||
command: custom
|
||||
custom: tool
|
||||
|
|
|
@ -9,13 +9,13 @@ function Get-Nodes
|
|||
{
|
||||
param(
|
||||
[parameter(ValueFromPipeline=$true)]
|
||||
[xml] $xml,
|
||||
[xml] $xml,
|
||||
[parameter(Mandatory=$true)]
|
||||
[string] $nodeName)
|
||||
|
||||
# Try the old style csproj. Also format required for .targets and .props files
|
||||
$n = Select-Xml -Xml $xml.Project -Namespace @{d = $ns } -XPath "//d:$nodeName"
|
||||
|
||||
|
||||
# Try the SDK-style files
|
||||
if (!$n) {
|
||||
$r = Select-Xml -Xml $xml.Project -XPath "//$nodeName"
|
||||
|
@ -28,7 +28,7 @@ function Get-NodeValue
|
|||
{
|
||||
param(
|
||||
[parameter(ValueFromPipeline=$true)]
|
||||
[xml] $xml,
|
||||
[xml] $xml,
|
||||
[string] $nodeName)
|
||||
|
||||
$node = get-nodes $xml $nodeName
|
||||
|
@ -45,7 +45,7 @@ function Get-NodeValue
|
|||
function Get-SdkVersion
|
||||
{
|
||||
param(
|
||||
[Parameter(ValueFromPipeline=$true)] $file)
|
||||
[Parameter(ValueFromPipeline=$true)] $file)
|
||||
|
||||
[xml] $xml = Get-Content $file
|
||||
|
||||
|
@ -150,7 +150,7 @@ foreach($version in $versions) {
|
|||
if ($version -match "10\.0\.\d{5}\.0") {
|
||||
$installRequired = Test-InstallWindowsSDK $version
|
||||
Write-Host "Windows SDK '$version' install required: $installRequired"
|
||||
if ($installRequired) {
|
||||
if ($installRequired) {
|
||||
# Automatically invoke Install-WindowsSDKIso.ps1 ?
|
||||
$anyInstallRequired = $true
|
||||
}
|
||||
|
@ -158,7 +158,7 @@ foreach($version in $versions) {
|
|||
}
|
||||
|
||||
Write-Host
|
||||
if ($anyInstallRequired) {
|
||||
if ($anyInstallRequired) {
|
||||
throw "At least one Windows SDK is missing from this machine"
|
||||
} else {
|
||||
Write-Host "All referenced Windows SDKs are installed!"
|
||||
|
|
|
@ -3,8 +3,8 @@ $currentDirectory = split-path $MyInvocation.MyCommand.Definition
|
|||
|
||||
# See if we have the ClientSecret available
|
||||
if([string]::IsNullOrEmpty($Env:SignClientSecret)){
|
||||
Write-Host "Client Secret not found, not signing packages"
|
||||
return;
|
||||
Write-Host "Client Secret not found, not signing packages"
|
||||
return;
|
||||
}
|
||||
|
||||
dotnet tool install --tool-path . SignClient
|
||||
|
@ -16,13 +16,13 @@ $appSettings = "$currentDirectory\SignClientSettings.json"
|
|||
$nupkgs = gci $Env:ArtifactDirectory\*.nupkg -recurse | Select -ExpandProperty FullName
|
||||
|
||||
foreach ($nupkg in $nupkgs){
|
||||
Write-Host "Submitting $nupkg for signing"
|
||||
Write-Host "Submitting $nupkg for signing"
|
||||
|
||||
.\SignClient 'sign' -c $appSettings -i $nupkg -r $Env:SignClientUser -s $Env:SignClientSecret -n 'Windows Community Toolkit' -d 'Windows Community Toolkit' -u 'https://developer.microsoft.com/en-us/windows/uwp-community-toolkit'
|
||||
.\SignClient 'sign' -c $appSettings -i $nupkg -r $Env:SignClientUser -s $Env:SignClientSecret -n 'Windows Community Toolkit' -d 'Windows Community Toolkit' -u 'https://developer.microsoft.com/en-us/windows/uwp-community-toolkit'
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
exit 1
|
||||
}
|
||||
Write-Host "Finished signing $nupkg"
|
||||
Write-Host "Finished signing $nupkg"
|
||||
}
|
||||
|
||||
Write-Host "Sign-package complete"
|
|
@ -312,7 +312,6 @@ Task("MSTestUITest")
|
|||
DotNetCoreTest(file.FullPath, testSettings);
|
||||
});
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
// TASK TARGETS
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
@ -353,8 +352,6 @@ Task("StyleXaml")
|
|||
}
|
||||
});
|
||||
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
// EXECUTION
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
|
@ -8,4 +8,4 @@
|
|||
<disabledPackageSources>
|
||||
<clear />
|
||||
</disabledPackageSources>
|
||||
</configuration>
|
||||
</configuration>
|
|
@ -7,7 +7,7 @@
|
|||
"SeparateByGroups": false,
|
||||
"AttributeIndentation": 0,
|
||||
"AttributeIndentationStyle": 1,
|
||||
"RemoveDesignTimeReferences": false,
|
||||
"RemoveDesignTimeReferences": false,
|
||||
"EnableAttributeReordering": true,
|
||||
"AttributeOrderingRuleGroups": [
|
||||
"x:Class",
|
||||
|
@ -39,4 +39,4 @@
|
|||
"FormatOnSave": true,
|
||||
"CommentPadding": 2,
|
||||
"IndentSize": 4
|
||||
}
|
||||
}
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
|
||||
"settings": {
|
||||
"orderingRules": {
|
||||
"usingDirectivesPlacement": "outsideNamespace"
|
||||
}
|
||||
{
|
||||
"$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
|
||||
"settings": {
|
||||
"orderingRules": {
|
||||
"usingDirectivesPlacement": "outsideNamespace"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -5,7 +5,7 @@
|
|||
"^refs/heads/dev$", // we release out of dev
|
||||
"^refs/heads/rel/\\d+\\.\\d+\\.\\d+" // we also release branches starting with rel/N.N.N
|
||||
],
|
||||
"nugetPackageVersion":{
|
||||
"nugetPackageVersion": {
|
||||
"semVer": 2
|
||||
},
|
||||
"cloudBuild": {
|
||||
|
@ -13,4 +13,4 @@
|
|||
"enabled": false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
Загрузка…
Ссылка в новой задаче