diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml index 31ff0a38..13bcf7cc 100644 --- a/azure-pipelines/build.yml +++ b/azure-pipelines/build.yml @@ -18,38 +18,13 @@ steps: inputs: useGlobalJson: true -- task: DotNetCoreCLI@1 - displayName: 'dotnet restore src/Microsoft.SqlTools.Credentials' - inputs: - command: restore - projects: '$(Build.SourcesDirectory)/src/Microsoft.SqlTools.Credentials' - arguments: '--configfile $(Build.SourcesDirectory)/nuget.config' - -- task: DotNetCoreCLI@1 - displayName: 'dotnet restore src/Microsoft.SqlTools.Hosting' - inputs: - command: restore - projects: '$(Build.SourcesDirectory)/src/Microsoft.SqlTools.Hosting' - arguments: '--configfile $(Build.SourcesDirectory)/nuget.config' - -- task: DotNetCoreCLI@1 - displayName: 'dotnet restore src/Microsoft.SqlTools.ServiceLayer' - inputs: - command: restore - projects: '$(Build.SourcesDirectory)/src/Microsoft.SqlTools.ServiceLayer' - arguments: '--configfile $(Build.SourcesDirectory)/nuget.config' - -- task: DotNetCoreCLI@1 - displayName: 'dotnet restore src/Microsoft.Kusto.ServiceLayer' - inputs: - command: restore - projects: '$(Build.SourcesDirectory)/src/Microsoft.Kusto.ServiceLayer' - arguments: '--configfile $(Build.SourcesDirectory)/nuget.config' - - task: DotNetCoreCLI@2 - displayName: 'dotnet build src/Microsoft.SqlTools.ServiceLayer' + displayName: 'dotnet restore sqltoolsservice.sln' inputs: - projects: '$(Build.SourcesDirectory)/src/Microsoft.SqlTools.ServiceLayer' + command: restore + projects: '$(Build.SourcesDirectory)/sqltoolsservice.sln' + feedsToUse: config + nugetConfigPath: nuget.config - task: DotNetCoreCLI@2 displayName: 'dotnet build src/Microsoft.Kusto.ServiceLayer' @@ -65,9 +40,11 @@ steps: - task: DotNetCoreCLI@2 displayName: 'dotnet build src/Microsoft.Kusto.ServiceLayer --configuration Release' inputs: - projects: '$(Build.SourcesDirectory)/src/Microsoft.Kusto.ServiceLayer ' + projects: '$(Build.SourcesDirectory)/src/Microsoft.Kusto.ServiceLayer' arguments: '--configuration Release' +- task: NuGetAuthenticate@0 + - task: BatchScript@1 displayName: 'Run script build.cmd' inputs: @@ -75,26 +52,26 @@ steps: arguments: '-target=all -mono' continueOnError: true -- task: DotNetCoreCLI@1 +- task: DotNetCoreCLI@2 displayName: 'dotnet restore test/Microsoft.SqlTools.ServiceLayer.UnitTests' inputs: command: restore projects: test/Microsoft.SqlTools.ServiceLayer.UnitTests -- task: DotNetCoreCLI@1 +- task: DotNetCoreCLI@2 displayName: 'dotnet restore test/Microsoft.Kusto.ServiceLayer.UnitTests' inputs: command: restore projects: test/Microsoft.Kusto.ServiceLayer.UnitTests -- task: DotNetCoreCLI@1 +- task: DotNetCoreCLI@2 displayName: 'dotnet test test/Microsoft.SqlTools.ServiceLayer.UnitTests' inputs: command: test projects: test/Microsoft.SqlTools.ServiceLayer.UnitTests arguments: '--logger "trx;LogFileName=xunit.trx"' -- task: DotNetCoreCLI@1 +- task: DotNetCoreCLI@2 displayName: 'dotnet test test/Microsoft.Kusto.ServiceLayer.UnitTests' inputs: command: test diff --git a/bin/nuget/Microsoft.SqlServer.Migration.Assessment.1.0.20201001.204.nupkg b/bin/nuget/Microsoft.SqlServer.Migration.Assessment.1.0.20201001.204.nupkg deleted file mode 100644 index 4e20dec6..00000000 Binary files a/bin/nuget/Microsoft.SqlServer.Migration.Assessment.1.0.20201001.204.nupkg and /dev/null differ diff --git a/bin/nuget/Microsoft.SqlServer.TransactSql.ScriptDom.NRT.1.2.65626.134.nupkg b/bin/nuget/Microsoft.SqlServer.TransactSql.ScriptDom.NRT.1.2.65626.134.nupkg deleted file mode 100644 index 9e0c86e7..00000000 Binary files a/bin/nuget/Microsoft.SqlServer.TransactSql.ScriptDom.NRT.1.2.65626.134.nupkg and /dev/null differ diff --git a/bin/nuget/OpenCover.4.6.684.nupkg b/bin/nuget/OpenCover.4.6.684.nupkg deleted file mode 100644 index 8cf43fda..00000000 Binary files a/bin/nuget/OpenCover.4.6.684.nupkg and /dev/null differ diff --git a/bin/nuget/mssql.ResX.0.2.0.nupkg b/bin/nuget/mssql.ResX.0.2.0.nupkg deleted file mode 100644 index 0012be07..00000000 Binary files a/bin/nuget/mssql.ResX.0.2.0.nupkg and /dev/null differ diff --git a/bin/nuget/mssql.XliffParser.0.5.3.nupkg b/bin/nuget/mssql.XliffParser.0.5.3.nupkg deleted file mode 100644 index dbae7fbf..00000000 Binary files a/bin/nuget/mssql.XliffParser.0.5.3.nupkg and /dev/null differ diff --git a/nuget.config b/nuget.config index f7e745a4..206b82ec 100644 --- a/nuget.config +++ b/nuget.config @@ -2,8 +2,6 @@ - - - + diff --git a/scripts/cake-bootstrap.ps1 b/scripts/cake-bootstrap.ps1 index a6e34175..3de9e96a 100644 --- a/scripts/cake-bootstrap.ps1 +++ b/scripts/cake-bootstrap.ps1 @@ -31,7 +31,7 @@ http://cakebuild.net Param( [string]$Script = "build.cake", [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")] - [string]$Verbosity = "Verbose", + [string]$Verbosity = "Verbose", [Alias("DryRun","Noop")] [switch]$WhatIf, [switch]$Mono, @@ -45,14 +45,14 @@ Write-Host "Preparing to run build script..." $PS_SCRIPT_ROOT = split-path -parent $MyInvocation.MyCommand.Definition; $TOOLS_DIR = Join-Path $PSScriptRoot "..\.tools" $NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe" -$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/v3.3.0/nuget.exe" +$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" $CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe" $PACKAGES_CONFIG = Join-Path $PS_SCRIPT_ROOT "packages.config" # Should we use mono? $UseMono = ""; if($Mono.IsPresent) { - Write-Verbose -Message "Using the Mono based scripting engine." + Write-Host "Using the Mono based scripting engine." $UseMono = "-mono" } @@ -64,13 +64,13 @@ if($WhatIf.IsPresent) { # Make sure tools folder exists if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) { - Write-Verbose -Message "Creating tools directory..." + Write-Host "Creating tools directory..." New-Item -Path $TOOLS_DIR -Type directory | out-null } # Try download NuGet.exe if not exists if (!(Test-Path $NUGET_EXE)) { - Write-Verbose -Message "Downloading NuGet.exe..." + Write-Host "Downloading NuGet.exe..." try { (New-Object System.Net.WebClient).DownloadFile($NUGET_URL, $NUGET_EXE) } catch { @@ -88,10 +88,10 @@ if(-Not $SkipToolPackageRestore.IsPresent) Push-Location Set-Location $TOOLS_DIR - Write-Verbose -Message "Restoring tools from NuGet..." + Write-Host "Restoring tools from NuGet..." $NuGetConfig = Invoke-Expression "&`"$NUGET_EXE`" config -configfile ../nuget.config" $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install $PACKAGES_CONFIG -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`"" - Write-Verbose -Message ($NuGetOutput | out-string) + Write-Host ($NuGetOutput | out-string) Pop-Location if ($LASTEXITCODE -ne 0) diff --git a/scripts/packages.config b/scripts/packages.config index af594c41..3f2dadef 100644 --- a/scripts/packages.config +++ b/scripts/packages.config @@ -6,4 +6,5 @@ + \ No newline at end of file diff --git a/sqltoolsservice.sln b/sqltoolsservice.sln index 11efaa0e..8b8be487 100644 --- a/sqltoolsservice.sln +++ b/sqltoolsservice.sln @@ -50,7 +50,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeCoverage", "CodeCoverag ProjectSection(SolutionItems) = preProject test\CodeCoverage\codecoverage.bat = test\CodeCoverage\codecoverage.bat test\CodeCoverage\gulpfile.js = test\CodeCoverage\gulpfile.js - test\CodeCoverage\nuget.config = test\CodeCoverage\nuget.config test\CodeCoverage\package.json = test\CodeCoverage\package.json test\CodeCoverage\packages.config = test\CodeCoverage\packages.config test\CodeCoverage\ReplaceText.vbs = test\CodeCoverage\ReplaceText.vbs @@ -280,7 +279,7 @@ Global {BB7FF5B5-84E3-4F4B-A2A7-2CC4C75632E9}.Integration|Any CPU.ActiveCfg = Debug|Any CPU {BB7FF5B5-84E3-4F4B-A2A7-2CC4C75632E9}.Integration|Any CPU.Build.0 = Debug|Any CPU {BB7FF5B5-84E3-4F4B-A2A7-2CC4C75632E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB7FF5B5-84E3-4F4B-A2A7-2CC4C75632E9}.Release|Any CPU.Build.0 = Release|Any CPU + {BB7FF5B5-84E3-4F4B-A2A7-2CC4C75632E9}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -313,7 +312,7 @@ Global {E0C941C8-91F2-4BE1-8B79-AC88EDB78729} = {2BBD7364-054F-4693-97CD-1C395E3E84A9} {AFCDED82-B659-4BE1-86ED-0F4F8BC661AE} = {AB9CA2B8-6F70-431C-8A1D-67479D8A7BE4} {7F2659DB-92C8-4823-AFB9-88BC1B6D959F} = {2BBD7364-054F-4693-97CD-1C395E3E84A9} - {BB7FF5B5-84E3-4F4B-A2A7-2CC4C75632E9} = {AB9CA2B8-6F70-431C-8A1D-67479D8A7BE4} + {BB7FF5B5-84E3-4F4B-A2A7-2CC4C75632E9} = {AB9CA2B8-6F70-431C-8A1D-67479D8A7BE4} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B31CDF4B-2851-45E5-8C5F-BE97125D9DD8} diff --git a/test/CodeCoverage/nuget.config b/test/CodeCoverage/nuget.config deleted file mode 100644 index 1eab8195..00000000 --- a/test/CodeCoverage/nuget.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - -