Skip to content

Commit 8d18fcb

Browse files
committed
Format Build related files
Normalize Tabs into Spaces Clean-up trailing white-spaces Fix-up new-lines where necessary
1 parent 9e6708f commit 8d18fcb

10 files changed

+33
-36
lines changed

.gitattributes

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#
1818
# Merging from the command prompt will add diff markers to the files if there
1919
# are conflicts (Merging from VS is not affected by the settings below, in VS
20-
# the diff markers are never inserted). Diff markers may cause the following
20+
# the diff markers are never inserted). Diff markers may cause the following
2121
# file extensions to fail to load in VS. An alternative would be to treat
2222
# these files as binary and thus will always conflict and require user
2323
# intervention with every merge. To do so, just uncomment the entries below
@@ -46,9 +46,9 @@
4646

4747
###############################################################################
4848
# diff behavior for common document formats
49-
#
49+
#
5050
# Convert binary document formats to text before diffing them. This feature
51-
# is only available from the command line. Turn it on by uncommenting the
51+
# is only available from the command line. Turn it on by uncommenting the
5252
# entries below.
5353
###############################################################################
5454
#*.doc diff=astextplain

.runsettings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<RunSettings>
22
<MSTest>
3-
<MaxCpuCount>0</MaxCpuCount>
3+
<MaxCpuCount>0</MaxCpuCount>
44
<Parallelize>
55
<Workers>0</Workers>
66
<Scope>ClassLevel</Scope>

azure-pipelines.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ pr:
1111
pool:
1212
vmImage: windows-2019
1313

14-
variables:
14+
variables:
1515
BuildConfiguration: Release
1616

1717
jobs:
1818
### BUILD ###
1919
- job: BuildBits
2020
timeoutInMinutes: 60
21-
21+
2222
steps:
2323
- task: BatchScript@1
2424
inputs:
@@ -32,7 +32,7 @@ jobs:
3232
inputs:
3333
versionSpec: 5.6.0
3434

35-
- task: DotNetCoreCLI@2
35+
- task: DotNetCoreCLI@2
3636
inputs:
3737
command: custom
3838
custom: tool
@@ -49,7 +49,7 @@ jobs:
4949
displayName: Build
5050

5151
### Unit Tests ###
52-
52+
5353
- powershell: .\build\build.ps1 -target=Test
5454
displayName: Test
5555

@@ -105,15 +105,15 @@ jobs:
105105
- job: SmokeTests
106106
dependsOn: BuildBits
107107
timeoutInMinutes: 60
108-
108+
109109
steps:
110110
- task: DownloadPipelineArtifact@2
111111
displayName: Download NuGet Packages Artifact
112112
inputs:
113113
artifact: Packages
114114
path: .\bin\nupkg
115115

116-
- task: DotNetCoreCLI@2
116+
- task: DotNetCoreCLI@2
117117
inputs:
118118
command: custom
119119
custom: tool

build/Find-WindowsSDKVersions.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ function Get-Nodes
99
{
1010
param(
1111
[parameter(ValueFromPipeline=$true)]
12-
[xml] $xml,
12+
[xml] $xml,
1313
[parameter(Mandatory=$true)]
1414
[string] $nodeName)
1515

1616
# Try the old style csproj. Also format required for .targets and .props files
1717
$n = Select-Xml -Xml $xml.Project -Namespace @{d = $ns } -XPath "//d:$nodeName"
18-
18+
1919
# Try the SDK-style files
2020
if (!$n) {
2121
$r = Select-Xml -Xml $xml.Project -XPath "//$nodeName"
@@ -28,7 +28,7 @@ function Get-NodeValue
2828
{
2929
param(
3030
[parameter(ValueFromPipeline=$true)]
31-
[xml] $xml,
31+
[xml] $xml,
3232
[string] $nodeName)
3333

3434
$node = get-nodes $xml $nodeName
@@ -45,7 +45,7 @@ function Get-NodeValue
4545
function Get-SdkVersion
4646
{
4747
param(
48-
[Parameter(ValueFromPipeline=$true)] $file)
48+
[Parameter(ValueFromPipeline=$true)] $file)
4949

5050
[xml] $xml = Get-Content $file
5151

@@ -150,15 +150,15 @@ foreach($version in $versions) {
150150
if ($version -match "10\.0\.\d{5}\.0") {
151151
$installRequired = Test-InstallWindowsSDK $version
152152
Write-Host "Windows SDK '$version' install required: $installRequired"
153-
if ($installRequired) {
153+
if ($installRequired) {
154154
# Automatically invoke Install-WindowsSDKIso.ps1 ?
155155
$anyInstallRequired = $true
156156
}
157157
}
158158
}
159159

160160
Write-Host
161-
if ($anyInstallRequired) {
161+
if ($anyInstallRequired) {
162162
throw "At least one Windows SDK is missing from this machine"
163163
} else {
164164
Write-Host "All referenced Windows SDKs are installed!"

build/Sign-Package.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ $currentDirectory = split-path $MyInvocation.MyCommand.Definition
33

44
# See if we have the ClientSecret available
55
if([string]::IsNullOrEmpty($Env:SignClientSecret)){
6-
Write-Host "Client Secret not found, not signing packages"
7-
return;
6+
Write-Host "Client Secret not found, not signing packages"
7+
return;
88
}
99

1010
dotnet tool install --tool-path . SignClient
@@ -16,13 +16,13 @@ $appSettings = "$currentDirectory\SignClientSettings.json"
1616
$nupkgs = gci $Env:ArtifactDirectory\*.nupkg -recurse | Select -ExpandProperty FullName
1717

1818
foreach ($nupkg in $nupkgs){
19-
Write-Host "Submitting $nupkg for signing"
19+
Write-Host "Submitting $nupkg for signing"
2020

21-
.\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'
21+
.\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'
2222
if ($LASTEXITCODE -ne 0) {
2323
exit 1
2424
}
25-
Write-Host "Finished signing $nupkg"
25+
Write-Host "Finished signing $nupkg"
2626
}
2727

2828
Write-Host "Sign-package complete"

build/build.cake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,6 @@ Task("MSTestUITest")
312312
DotNetCoreTest(file.FullPath, testSettings);
313313
});
314314

315-
316315
//////////////////////////////////////////////////////////////////////
317316
// TASK TARGETS
318317
//////////////////////////////////////////////////////////////////////
@@ -353,8 +352,6 @@ Task("StyleXaml")
353352
}
354353
});
355354

356-
357-
358355
//////////////////////////////////////////////////////////////////////
359356
// EXECUTION
360357
//////////////////////////////////////////////////////////////////////

nuget.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
<disabledPackageSources>
99
<clear />
1010
</disabledPackageSources>
11-
</configuration>
11+
</configuration>

settings.xamlstyler

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"SeparateByGroups": false,
88
"AttributeIndentation": 0,
99
"AttributeIndentationStyle": 1,
10-
"RemoveDesignTimeReferences": false,
10+
"RemoveDesignTimeReferences": false,
1111
"EnableAttributeReordering": true,
1212
"AttributeOrderingRuleGroups": [
1313
"x:Class",
@@ -39,4 +39,4 @@
3939
"FormatOnSave": true,
4040
"CommentPadding": 2,
4141
"IndentSize": 4
42-
}
42+
}

stylecop.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
{
2-
"$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
3-
"settings": {
4-
"orderingRules": {
5-
"usingDirectivesPlacement": "outsideNamespace"
6-
}
1+
{
2+
"$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
3+
"settings": {
4+
"orderingRules": {
5+
"usingDirectivesPlacement": "outsideNamespace"
76
}
8-
}
7+
}
8+
}

version.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"^refs/heads/dev$", // we release out of dev
66
"^refs/heads/rel/\\d+\\.\\d+\\.\\d+" // we also release branches starting with rel/N.N.N
77
],
8-
"nugetPackageVersion":{
8+
"nugetPackageVersion": {
99
"semVer": 2
1010
},
1111
"cloudBuild": {
1212
"buildNumber": {
1313
"enabled": false
1414
}
1515
}
16-
}
16+
}

0 commit comments

Comments
 (0)