diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..7589c46 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,15 @@ +# Remove the line below if you want to inherit .editorconfig settings from higher directories +root = true + +# Generated code +[*{_AssemblyInfo.cs,.g.cs}] +generated_code = true + +# All files +[*] + +# .NET Foundation Header +file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.\nSee the LICENSE file in the project root for more information. + +# Require file header +dotnet_diagnostic.IDE0073.severity = warning diff --git a/ColorCode.sln b/ColorCode.sln index 4365b2c..b67cc75 100644 --- a/ColorCode.sln +++ b/ColorCode.sln @@ -19,8 +19,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColorCode.WinUI", "ColorCod EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A4B1B99B-FC3A-4C76-8B46-B96723829FD2}" ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig azure-pipelines.yml = azure-pipelines.yml - build\build.cake = build\build.cake ColorCode.snk = ColorCode.snk Directory.Build.props = Directory.Build.props Directory.Build.targets = Directory.Build.targets diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1f99bc1..a55e363 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -47,15 +47,8 @@ steps: - powershell: .\build\Install-WindowsSdkISO.ps1 18362 -- task: DotNetCoreCLI@2 - inputs: - command: custom - custom: msbuild - arguments: /t:restore .\ColorCode.sln - displayName: NuGet restore - -- powershell: .\build\build.ps1 - displayName: Build +- script: msbuild -p:Configuration=Release -r -t:pack -p:GenerateLibraryLayout=true -p:PackageOutputPath=..\build\nupkg .\ColorCode.sln + displayName: Build and pack - task: PowerShell@2 displayName: Authenticode Sign Packages @@ -70,6 +63,6 @@ steps: - task: PublishBuildArtifacts@1 displayName: Publish Package Artifacts inputs: - pathToPublish: .\build\nupkg + pathToPublish: 'build\nupkg' artifactType: container artifactName: Packages \ No newline at end of file diff --git a/build/Build.bat b/build/Build.bat deleted file mode 100644 index f541994..0000000 --- a/build/Build.bat +++ /dev/null @@ -1,3 +0,0 @@ -@ECHO OFF -PowerShell.exe -file build.ps1 -PAUSE \ No newline at end of file diff --git a/build/UpdateHeaders.bat b/build/UpdateHeaders.bat deleted file mode 100644 index 5587277..0000000 --- a/build/UpdateHeaders.bat +++ /dev/null @@ -1,3 +0,0 @@ -@ECHO OFF -PowerShell.exe -file "%~dp0build.ps1" -Target UpdateHeaders -PAUSE \ No newline at end of file diff --git a/build/build.cake b/build/build.cake deleted file mode 100644 index 2c085d7..0000000 --- a/build/build.cake +++ /dev/null @@ -1,177 +0,0 @@ -#module nuget:?package=Cake.LongPath.Module&version=1.0.1 - -#addin nuget:?package=Cake.FileHelpers&version=4.0.1 -#addin nuget:?package=Cake.Powershell&version=1.0.1 -#addin nuget:?package=Cake.GitVersioning&version=3.4.244 - -#tool nuget:?package=vswhere&version=2.8.4 - -using System; -using System.Linq; -using System.Text.RegularExpressions; - -////////////////////////////////////////////////////////////////////// -// ARGUMENTS -////////////////////////////////////////////////////////////////////// - -var target = Argument("target", "Default"); - -////////////////////////////////////////////////////////////////////// -// PREPARATION -////////////////////////////////////////////////////////////////////// - -var baseDir = MakeAbsolute(Directory("../")).ToString(); -var buildDir = baseDir + "/build"; - -var Solution = baseDir + "/ColorCode.sln"; -var nupkgDir = buildDir + "/nupkg"; - -string Version = null; - -////////////////////////////////////////////////////////////////////// -// METHODS -////////////////////////////////////////////////////////////////////// - -void VerifyHeaders(bool Replace) -{ - var header = FileReadText("header.txt") + "\r\n"; - bool hasMissing = false; - - Func exclude_objDir = - fileSystemInfo => !fileSystemInfo.Path.Segments.Contains("obj"); - - var files = GetFiles(baseDir + "/**/*.cs", new GlobberSettings { Predicate = exclude_objDir }).Where(file => - { - var path = file.ToString(); - return !(path.EndsWith(".g.cs") || path.EndsWith(".i.cs") || System.IO.Path.GetFileName(path).Contains("TemporaryGeneratedFile")); - }); - - Information("\nChecking " + files.Count() + " file header(s)"); - foreach(var file in files) - { - var oldContent = FileReadText(file); - if(oldContent.Contains("// ")) - { - continue; - } - var rgx = new Regex("^(//.*\r?\n)*\r?\n"); - var newContent = header + rgx.Replace(oldContent, ""); - - if(!newContent.Equals(oldContent, StringComparison.Ordinal)) - { - if(Replace) - { - Information("\nUpdating " + file + " header..."); - FileWriteText(file, newContent); - } - else - { - Error("\nWrong/missing header on " + file); - hasMissing = true; - } - } - } - - if(!Replace && hasMissing) - { - throw new Exception("Please run UpdateHeaders.bat or '.\\build.ps1 -target=UpdateHeaders' and commit the changes."); - } -} - -void RetrieveVersion() -{ - Information("\nRetrieving version..."); - Version = GitVersioningGetVersion().NuGetPackageVersion; - Information("\nBuild Version: " + Version); -} - -void UpdateToolsPath(MSBuildSettings buildSettings) -{ - // Workaround for https://github.com/cake-build/cake/issues/2128 - var vsInstallation = VSWhereLatest(new VSWhereLatestSettings { Requires = "Microsoft.Component.MSBuild", IncludePrerelease = false }); - - if (vsInstallation != null) - { - buildSettings.ToolPath = vsInstallation.CombineWithFilePath(@"MSBuild\Current\Bin\MSBuild.exe"); - if (!FileExists(buildSettings.ToolPath)) - buildSettings.ToolPath = vsInstallation.CombineWithFilePath(@"MSBuild\15.0\Bin\MSBuild.exe"); - } -} - -////////////////////////////////////////////////////////////////////// -// TASKS -////////////////////////////////////////////////////////////////////// - -Task("Clean") - .Does(() => -{ - Information("\nCleaning Package Directory"); - CleanDirectory(nupkgDir); -}); - -Task("Restore-NuGet-Packages") - .IsDependentOn("Clean") - .Does(() => -{ - DotNetCoreRestore(Solution); -}); - -Task("Verify") - .Description("Run pre-build verifications") - .IsDependentOn("Clean") - .Does(() => -{ - VerifyHeaders(false); - - StartPowershellFile("./Find-WindowsSDKVersions.ps1"); -}); - -Task("Version") - .Description("Updates the version information in all Projects") - .IsDependentOn("Verify") - .IsDependentOn("Restore-NuGet-Packages") - .Does(() => -{ - RetrieveVersion(); -}); - -Task("Build") - .IsDependentOn("Version") - .Does(() => -{ - Information("\nBuilding Solution"); - var buildSettings = new MSBuildSettings - { - MaxCpuCount = 0 - } - .SetConfiguration("Release") - .WithTarget("Pack") - .WithProperty("GenerateLibraryLayout", "true") - .WithProperty("PackageOutputPath", nupkgDir); - - UpdateToolsPath(buildSettings); - - EnsureDirectoryExists(nupkgDir); - - MSBuild(Solution, buildSettings); -}); - -////////////////////////////////////////////////////////////////////// -// TASK TARGETS -////////////////////////////////////////////////////////////////////// - -Task("Default") - .IsDependentOn("Build"); - -Task("UpdateHeaders") - .Description("Updates the headers in *.cs files") - .Does(() => -{ - VerifyHeaders(true); -}); - -////////////////////////////////////////////////////////////////////// -// EXECUTION -////////////////////////////////////////////////////////////////////// - -RunTarget(target); diff --git a/build/build.ps1 b/build/build.ps1 deleted file mode 100644 index 2636495..0000000 --- a/build/build.ps1 +++ /dev/null @@ -1,274 +0,0 @@ -########################################################################## -# This is the Cake bootstrapper script for PowerShell. -# This file was downloaded from https://github.com/cake-build/resources -# Feel free to change this file to fit your needs. -########################################################################## - -<# - -.SYNOPSIS -This is a Powershell script to bootstrap a Cake build. - -.DESCRIPTION -This Powershell script will download NuGet if missing, restore NuGet tools (including Cake) -and execute your Cake build script with the parameters you provide. - -.PARAMETER Script -The build script to execute. -.PARAMETER Target -The build script target to run. -.PARAMETER Configuration -The build configuration to use. -.PARAMETER Verbosity -Specifies the amount of information to be displayed. -.PARAMETER ShowDescription -Shows description about tasks. -.PARAMETER DryRun -Performs a dry run. -.PARAMETER SkipToolPackageRestore -Skips restoring of packages. -.PARAMETER ScriptArgs -Remaining arguments are added here. - -.LINK -https://cakebuild.net - -#> - -[CmdletBinding()] -Param( - [string]$Script, - [string]$Target, - [string]$Configuration, - [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")] - [string]$Verbosity, - [switch]$ShowDescription, - [Alias("WhatIf", "Noop")] - [switch]$DryRun, - [switch]$SkipToolPackageRestore, - [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)] - [string[]]$ScriptArgs -) - -# This is an automatic variable in PowerShell Core, but not in Windows PowerShell 5.x -if (-not (Test-Path variable:global:IsCoreCLR)) { - $IsCoreCLR = $false -} - -# Attempt to set highest encryption available for SecurityProtocol. -# PowerShell will not set this by default (until maybe .NET 4.6.x). This -# will typically produce a message for PowerShell v2 (just an info -# message though) -try { - # Set TLS 1.2 (3072), then TLS 1.1 (768), then TLS 1.0 (192), finally SSL 3.0 (48) - # Use integers because the enumeration values for TLS 1.2 and TLS 1.1 won't - # exist in .NET 4.0, even though they are addressable if .NET 4.5+ is - # installed (.NET 4.5 is an in-place upgrade). - # PowerShell Core already has support for TLS 1.2 so we can skip this if running in that. - if (-not $IsCoreCLR) { - [System.Net.ServicePointManager]::SecurityProtocol = 3072 -bor 768 -bor 192 -bor 48 - } - } catch { - Write-Output 'Unable to set PowerShell to use TLS 1.2 and TLS 1.1 due to old .NET Framework installed. If you see underlying connection closed or trust errors, you may need to upgrade to .NET Framework 4.5+ and PowerShell v3' - } - -[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null -function MD5HashFile([string] $filePath) -{ - if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf)) - { - return $null - } - - [System.IO.Stream] $file = $null; - [System.Security.Cryptography.MD5] $md5 = $null; - try - { - $md5 = [System.Security.Cryptography.MD5]::Create() - $file = [System.IO.File]::OpenRead($filePath) - return [System.BitConverter]::ToString($md5.ComputeHash($file)) - } - finally - { - if ($file -ne $null) - { - $file.Dispose() - } - } -} - -function GetProxyEnabledWebClient -{ - $wc = New-Object System.Net.WebClient - $proxy = [System.Net.WebRequest]::GetSystemWebProxy() - $proxy.Credentials = [System.Net.CredentialCache]::DefaultCredentials - $wc.Proxy = $proxy - return $wc -} - -Write-Host "Preparing to run build script..." - -if(!$PSScriptRoot){ - $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent -} - -if(!$Script){ - $Script = Join-Path $PSScriptRoot "build.cake" -} -$TOOLS_DIR = Join-Path $PSScriptRoot "tools" -$ADDINS_DIR = Join-Path $TOOLS_DIR "Addins" -$MODULES_DIR = Join-Path $TOOLS_DIR "Modules" -$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe" -$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe" -$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config" -$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum" -$ADDINS_PACKAGES_CONFIG = Join-Path $ADDINS_DIR "packages.config" -$MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config" - -$env:CAKE_PATHS_TOOLS = $TOOLS_DIR -$env:CAKE_PATHS_ADDINS = $ADDINS_DIR -$env:CAKE_PATHS_MODULES = $MODULES_DIR - -# Make sure tools folder exists -if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) { - Write-Verbose -Message "Creating tools directory..." - New-Item -Path $TOOLS_DIR -Type Directory | Out-Null -} - -# Make sure that packages.config exist. -if (!(Test-Path $PACKAGES_CONFIG)) { - Write-Verbose -Message "Downloading packages.config..." - try { - $wc = GetProxyEnabledWebClient - $wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) - } catch { - Throw "Could not download packages.config." - } -} - -# Try find NuGet.exe in path if not exists -if (!(Test-Path $NUGET_EXE)) { - Write-Verbose -Message "Trying to find nuget.exe in PATH..." - $existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_ -PathType Container) } - $NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1 - if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) { - Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)." - $NUGET_EXE = $NUGET_EXE_IN_PATH.FullName - } -} - -# Try download NuGet.exe if not exists -if (!(Test-Path $NUGET_EXE)) { - Write-Verbose -Message "Downloading NuGet.exe..." - try { - $wc = GetProxyEnabledWebClient - $wc.DownloadFile($NUGET_URL, $NUGET_EXE) - } catch { - Throw "Could not download NuGet.exe." - } -} - -# These are automatic variables in PowerShell Core, but not in Windows PowerShell 5.x -if (-not (Test-Path variable:global:ismacos)) { - $IsLinux = $false - $IsMacOS = $false -} - -# Save nuget.exe path to environment to be available to child processed -$env:NUGET_EXE = $NUGET_EXE -$env:NUGET_EXE_INVOCATION = if ($IsLinux -or $IsMacOS) { - "mono `"$NUGET_EXE`"" -} else { - "`"$NUGET_EXE`"" -} - -# Restore tools from NuGet? -if(-Not $SkipToolPackageRestore.IsPresent) { - Push-Location - Set-Location $TOOLS_DIR - - # Check for changes in packages.config and remove installed tools if true. - [string] $md5Hash = MD5HashFile $PACKAGES_CONFIG - if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or - ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) { - Write-Verbose -Message "Missing or changed package.config hash..." - Get-ChildItem -Exclude packages.config,nuget.exe,Cake.Bakery | - Remove-Item -Recurse -Force - } - - Write-Verbose -Message "Restoring tools from NuGet..." - - $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occurred while restoring NuGet tools." - } - else - { - $md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII" - } - Write-Verbose -Message ($NuGetOutput | Out-String) - - Pop-Location -} - -# Restore addins from NuGet -if (Test-Path $ADDINS_PACKAGES_CONFIG) { - Push-Location - Set-Location $ADDINS_DIR - - Write-Verbose -Message "Restoring addins from NuGet..." - $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occurred while restoring NuGet addins." - } - - Write-Verbose -Message ($NuGetOutput | Out-String) - - Pop-Location -} - -# Restore modules from NuGet -if (Test-Path $MODULES_PACKAGES_CONFIG) { - Push-Location - Set-Location $MODULES_DIR - - Write-Verbose -Message "Restoring modules from NuGet..." - $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occurred while restoring NuGet modules." - } - - Write-Verbose -Message ($NuGetOutput | Out-String) - - Pop-Location -} - -# Make sure that Cake has been installed. -if (!(Test-Path $CAKE_EXE)) { - Throw "Could not find Cake.exe at $CAKE_EXE" -} - -$CAKE_EXE_INVOCATION = if ($IsLinux -or $IsMacOS) { - "mono `"$CAKE_EXE`"" -} else { - "`"$CAKE_EXE`"" -} - - # Build an array (not a string) of Cake arguments to be joined later -$cakeArguments = @() -if ($Script) { $cakeArguments += "`"$Script`"" } -if ($Target) { $cakeArguments += "--target=`"$Target`"" } -if ($Configuration) { $cakeArguments += "--configuration=$Configuration" } -if ($Verbosity) { $cakeArguments += "--verbosity=$Verbosity" } -if ($ShowDescription) { $cakeArguments += "--showdescription" } -if ($DryRun) { $cakeArguments += "--dryrun" } -$cakeArguments += $ScriptArgs - -# Start Cake -Write-Host "Running build script..." -Invoke-Expression "& $CAKE_EXE_INVOCATION $($cakeArguments -join " ")" -exit $LASTEXITCODE \ No newline at end of file diff --git a/build/header.txt b/build/header.txt deleted file mode 100644 index 45274ba..0000000 --- a/build/header.txt +++ /dev/null @@ -1,3 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. diff --git a/build/tools/packages.config b/build/tools/packages.config deleted file mode 100644 index 2a03746..0000000 --- a/build/tools/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - -