diff --git a/.gitignore b/.gitignore index 3fc7dd1c34..541e1f92d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,48 +1,84 @@ -*.ide - -*.results.xml -_AzurePackage -*.bak -_PackagedWebsite -Packages.dgml - -# https://raw.github.com/github/gitignore/master/VisualStudio.gitignore ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore # User-specific files +*.rsuser *.suo *.user +*.userosscache *.sln.docstates +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + # Build results [Dd]ebug/ +[Dd]ebugPublic/ [Rr]elease/ +[Rr]eleases/ x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ [Bb]in/ [Oo]bj/ +[Ll]og/ +[Ll]ogs/ -# Files created and used by our build scripts -build/ -tools/ -.nuget/credprovider -.nuget/.marker.v* -nuget.exe -AssemblyInfo.g.cs -*.g.txt -tests/Scripts/Config-*.json +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ # MSTest test Results [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio *_i.c *_p.c +*_h.h *.ilk *.meta *.obj +*.iobj *.pch *.pdb +*.ipdb *.pgc *.pgd *.rsp @@ -52,26 +88,41 @@ tests/Scripts/Config-*.json *.tlh *.tmp *.tmp_proj +*_wpftmp.csproj *.log +*.tlog *.vspscc *.vssscc .builds *.pidb -*.log +*.svclog *.scc +# Chutzpah Test files +_Chutzpah* + # Visual C++ cache files ipch/ *.aps *.ncb +*.opendb *.opensdf *.sdf *.cachefile +*.VC.db +*.VC.VC.opendb # Visual Studio profiler *.psess *.vsp *.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ # Guidance Automation Toolkit *.gpState @@ -79,6 +130,7 @@ ipch/ # ReSharper is a .NET coding add-in _ReSharper*/ *.[Rr]e[Ss]harper +*.DotSettings.user # TeamCity is a build add-in _TeamCity* @@ -86,9 +138,30 @@ _TeamCity* # DotCover is a Code Coverage Tool *.dotCover +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + # NCrunch -*.ncrunch* +_NCrunch_* .*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ # Installshield output folder [Ee]xpress/ @@ -107,89 +180,251 @@ DocProject/Help/html publish/ # Publish Web Output -*.Publish.xml +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted *.pubxml - -# NuGet Packages Directory -packages/ - -# Windows Azure Build Output -csx +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ *.build.csdef -# Windows Store app package directory +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ # Others -sql/ -*.Cache ClientBin/ -[Ss]tyle[Cc]op.* ~$* *~ *.dbmdl -*.[Pp]ublish.xml +*.dbproj.schemaview +*.jfm *.pfx *.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ # RIA/Silverlight projects Generated_Code/ -# Backup & report files from converting an old project file to a newer -# Visual Studio version. Backup files are not needed, because we have git ;-) +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) _UpgradeReport_Files/ Backup*/ UpgradeLog*.XML UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak -# ========================= -# Windows detritus -# ========================= +# SQL Server files +*.mdf +*.ldf +*.ndf -# Windows image file caches -Thumbs.db -ehthumbs.db +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl -# Folder config file -Desktop.ini +# Microsoft Fakes +FakesAssemblies/ -# Recycle Bin used on file shares -$RECYCLE.BIN/ +# GhostDoc plugin setting file +*.GhostDoc.xml -# Mac -.DS_Store +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ -# NuGetGallery Specific Ignores -src/NuGetGallery/App_Data/* -!src/NuGetGallery/App_Data/Files/ -src/NuGetGallery/App_Data/Files/* -!src/NuGetGallery/App_Data/Files/Content/ -!src/NuGetGallery/Views/Packages/ -!src/NuGetGallery/Branding/Views/Packages/ +# Visual Studio 6 build log +*.plg -# Kudu build folder -build/artifacts/ +# Visual Studio 6 workspace options file +*.opt -# Exclude Azure Publish Profiles -*.pubxml -tests/Scripts/TestResults[*].trx -src/NuGetGallery.Cloud/ecf/ -*.trx +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml + +####################### +# Repository specific # +####################### +build/ +tools/ +Results.*.xml +AssemblyInfo.*.cs +.nuget/.marker.v* +nuget.exe + +# Functional test results tests/functionaltests.*.xml -Results.?.xml +tests/Scripts/TestResults[*].trx -# Vs2015 # The applicationhost.config is ignored, but already comitted on purpose # Reason: The localtest.me setting needs to be configured in the -section. # See ReadMe.md for more information .vs/config/applicationhost.config -artifacts/ -.vs -# files are created at build time +# Files are created at build time src/NuGetGallery/Content/gallery/css/bootstrap-theme.css src/NuGetGallery/Content/gallery/css/bootstrap.css src/NuGetGallery/Scripts/gallery/bootstrap.js -#rider -.idea/ +# NuGetGallery Specific Ignores +src/NuGetGallery/App_Data/* +!src/NuGetGallery/App_Data/Files/ +src/NuGetGallery/App_Data/Files/* +!src/NuGetGallery/App_Data/Files/Content/ +!src/NuGetGallery/Views/Packages/ +!src/NuGetGallery/Branding/Views/Packages/ diff --git a/.nuget/packages.config b/.nuget/packages.config deleted file mode 100644 index 272c1200b8..0000000000 --- a/.nuget/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.pipelines/NuGetGallery-CI.yml b/.pipelines/NuGetGallery-CI.yml index cbde462043..d0931cc4b1 100644 --- a/.pipelines/NuGetGallery-CI.yml +++ b/.pipelines/NuGetGallery-CI.yml @@ -17,11 +17,9 @@ variables: value: true - name: NugetSecurityAnalysisWarningLevel value: none -- name: PackageVersion - value: $(SimplePackageVersion)$(PrereleaseVersion) -- name: PrereleaseVersion - value: -$(NuGetGalleryBranch)-$(Build.BuildId) -- name: SimplePackageVersion +- name: GalleryPackageVersion + value: $(GalleryAssemblyVersion)-$(NuGetGalleryBranch)-$(Build.BuildId) +- name: GalleryAssemblyVersion value: 4.4.5 - name: nugetMultiFeedWarnLevel value: none @@ -68,7 +66,7 @@ extends: displayName: Build inputs: scriptName: $(NuGetGalleryPath)\build.ps1 - arguments: -Configuration $(BuildConfiguration) -BuildNumber $(Build.BuildId) -SimpleVersion $(SimplePackageVersion) -SemanticVersion $(PackageVersion) -Branch $(NuGetGalleryBranch) -CommitSHA $(Build.SourceVersion) + arguments: -Configuration $(BuildConfiguration) -BuildNumber $(Build.BuildId) -GalleryAssemblyVersion $(GalleryAssemblyVersion) -GalleryPackageVersion $(GalleryPackageVersion) -Branch $(NuGetGalleryBranch) -CommitSHA $(Build.SourceVersion) workingFolder: $(NuGetGalleryPath) - task: PowerShell@1 name: PowerShell_2 diff --git a/Deploy-StaticContent.ps1 b/Deploy-StaticContent.ps1 deleted file mode 100644 index 76161fa92a..0000000000 --- a/Deploy-StaticContent.ps1 +++ /dev/null @@ -1,24 +0,0 @@ -[CmdletBinding(DefaultParameterSetName='RegularBuild')] -param ( - [string]$StorageAccountName, - [string]$StorageAccountKey, - [string]$Environment -) - -Write-Host "Uploading static $Environment gallery content to $StorageAccountName." - -[System.Reflection.Assembly]::LoadFrom("C:\Program Files\Microsoft SDKs\Azure\.NET SDK\v2.9\bin\Microsoft.WindowsAzure.StorageClient.dll") - -$account = [Microsoft.WindowsAzure.CloudStorageAccount]::Parse("DefaultEndpointsProtocol=https;AccountName=$StorageAccountName;AccountKey=$StorageAccountKey") -$client = [Microsoft.WindowsAzure.StorageClient.CloudStorageAccountStorageClientExtensions]::CreateCloudBlobClient($account) - -$files = Get-ChildItem ".\content\$Environment" -foreach ($file in $files) { - $blob = $client.GetBlockBlob("content/$file") - try { - $snappy = $blob.CreateSnapshot() - Write-Host "Created snapshot of existing 'content/$file'." - } catch {} - $blob.UploadFile($file.FullName) - Write-Host "Uploaded 'content/$file'." -} \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index ade4649330..542d6fc1bf 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,14 +1,30 @@ + .NET Foundation + Apache-2.0 + https://github.com/NuGet/NuGetGallery + © .NET Foundation. All rights reserved. + .NET Foundation + en-US + + true + true + true + snupkg 9.0 - 6.9.1 - 2.120.0 - 4.3.0-agr-gal-stsdk-9768098 + + false + false + false + - 8.0.0 runtime; build; native; contentfiles; analyzers all diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000000..7ddad720fa --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,120 @@ + + + true + false + false + + 6.9.1 + 2.120.0 + 4.3.0-agr-gal-stsdk-9768098 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NuGet.config b/NuGet.config index 4a76bd51a3..1016323b12 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,20 +1,16 @@  - - - - - - - - + + + + - + @@ -69,7 +65,4 @@ - - - diff --git a/README.md b/README.md index 9a51e6c12c..abdecfba26 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,7 @@ This should help prevent unwanted file commits. create one and assign it to yourself! git checkout dev - git checkout -b anurse-123 + git checkout -b billg-123 3. __Do your work.__ Now, do your work using the following highly accurate and efficient algorithm :) @@ -142,7 +142,7 @@ This should help prevent unwanted file commits. 5. if (moreWorkToDo) go to #3.1 else go to #4. 4. __Start a code review.__ - Start a code review by pushing your branch up to GitHub (```git push origin anurse-123```) and + Start a code review by pushing your branch up to GitHub (```git push origin billg-123```) and creating a Pull Request from your branch to ***dev***. Wait for at least someone on the team to respond with: ":shipit:" (that's called the "Ship-It Squirrel" and you can put it in your own comments by typing ```:shipit:```). @@ -153,7 +153,7 @@ This should help prevent unwanted file commits. git checkout dev git pull origin dev - git merge anurse-123 + git merge billg-123 ... resolve conflicts ... git push origin dev diff --git a/SdkProjects.props b/SdkProjects.props index d8bf96a6ae..24e9e4ac55 100644 --- a/SdkProjects.props +++ b/SdkProjects.props @@ -3,32 +3,12 @@ These properties are only meant for projects using the newer SDK-based project style. Properties that are meant for all projects (both legacy .csproj and SDK-based .csproj) should be put in Directory.Build.props. --> - - .NET Foundation - Apache-2.0 - https://github.com/NuGet/NuGetGallery - © .NET Foundation. All rights reserved. - .NET Foundation - - en-US - - true - true - true - snupkg - - false - false - false - - - 0.3.0 runtime; build; native; contentfiles; analyzers all - + all diff --git a/build.cmd b/build.cmd deleted file mode 100644 index dea8289527..0000000000 --- a/build.cmd +++ /dev/null @@ -1 +0,0 @@ -PowerShell.exe -NoProfile -ExecutionPolicy ByPass ".\buildandtest.ps1 -Configuration 'Release' -Verbose" \ No newline at end of file diff --git a/build.ps1 b/build.ps1 index 0db5865a59..4e2dea8484 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,16 +1,15 @@ -[CmdletBinding(DefaultParameterSetName='RegularBuild')] +[CmdletBinding(DefaultParameterSetName = 'RegularBuild')] param ( [ValidateSet("debug", "release")] [string]$Configuration = 'debug', [int]$BuildNumber, [switch]$SkipRestore, [switch]$CleanCache, - [string]$SimpleVersion = '4.4.5', - [string]$SemanticVersion = '4.4.5-zlocal', - [string]$PackageSuffix, + [string]$GalleryAssemblyVersion = '4.4.5', + [string]$GalleryPackageVersion = '4.4.5-zlocal', [string]$Branch, [string]$CommitSHA, - [string]$BuildBranchCommit = '5295c6e0d2ae7357fccf01e48c56b768b192f022', #DevSkim: ignore DS173237. Not a secret/token. It is a commit hash. + [string]$BuildBranchCommit = '195208052bf615b79950f8fb093b84ec290f0806', #DevSkim: ignore DS173237. Not a secret/token. It is a commit hash. [string]$VerifyMicrosoftPackageVersion = $null ) @@ -32,15 +31,6 @@ if (-not (Test-Path "$PSScriptRoot/build")) { Invoke-WebRequest -UseBasicParsing -Uri "https://raw.githubusercontent.com/NuGet/ServerCommon/$BuildBranchCommit/build/init.ps1" -OutFile "$PSScriptRoot/build/init.ps1" . "$PSScriptRoot/build/init.ps1" -BuildBranchCommit $BuildBranchCommit -Function Clean-Tests { - [CmdletBinding()] - param() - - Trace-Log 'Cleaning test results' - - Remove-Item (Join-Path $PSScriptRoot "Results.*.xml") -} - Write-Host ("`r`n" * 3) Trace-Log ('=' * 60) @@ -55,7 +45,7 @@ $BuildErrors = @() Invoke-BuildStep 'Getting private build tools' { Install-PrivateBuildTools } ` -ev +BuildErrors -Invoke-BuildStep 'Cleaning test results' { Clean-Tests } ` +Invoke-BuildStep 'Cleaning test results' { Clear-Tests } ` -ev +BuildErrors Invoke-BuildStep 'Installing NuGet.exe' { Install-NuGet } ` @@ -69,71 +59,76 @@ Invoke-BuildStep 'Clearing artifacts' { Clear-Artifacts } ` -ev +BuildErrors Invoke-BuildStep 'Restoring solution packages' { ` - Install-SolutionPackages -path (Join-Path $PSScriptRoot ".nuget\packages.config") -output (Join-Path $PSScriptRoot "packages") -excludeversion } ` + Install-SolutionPackages -path (Join-Path $PSScriptRoot "packages.config") -output (Join-Path $PSScriptRoot "packages") -excludeversion } ` -skip:$SkipRestore ` -ev +BuildErrors Invoke-BuildStep 'Set version metadata in AssemblyInfo.cs' { - $Paths = ` - (Join-Path $PSScriptRoot "src\NuGetGallery\Properties\AssemblyInfo.g.cs"), ` - (Join-Path $PSScriptRoot "src\NuGetGallery.Core\Properties\AssemblyInfo.g.cs"), ` - (Join-Path $PSScriptRoot "src\NuGetGallery.Services\Properties\AssemblyInfo.g.cs"), ` - (Join-Path $PSScriptRoot "src\NuGet.Services.Entities\Properties\AssemblyInfo.g.cs"), ` - (Join-Path $PSScriptRoot "src\NuGet.Services.DatabaseMigration\Properties\AssemblyInfo.g.cs"), ` - (Join-Path $PSScriptRoot "src\DatabaseMigrationTools\Properties\AssemblyInfo.g.cs"), ` - (Join-Path $PSScriptRoot "src\AccountDeleter\Properties\AssemblyInfo.g.cs"), ` - (Join-Path $PSScriptRoot "src\GitHubVulnerabilities2Db\Properties\AssemblyInfo.g.cs"), ` - (Join-Path $PSScriptRoot "src\GitHubVulnerabilities2v3\Properties\AssemblyInfo.g.cs"), ` - (Join-Path $PSScriptRoot "src\GalleryTools\Properties\AssemblyInfo.g.cs"), ` - (Join-Path $PSScriptRoot "src\VerifyMicrosoftPackage\Properties\AssemblyInfo.g.cs") - - Foreach ($Path in $Paths) { - # Ensure the directory exists before generating the version info file. - $directory = Split-Path $Path - New-Item -ItemType Directory -Force -Path $directory | Out-Null - Set-VersionInfo -Path $Path -Version $SimpleVersion -Branch $Branch -Commit $CommitSHA - } -} ` --ev +BuildErrors + $GalleryAssemblyInfo = + "src\AccountDeleter\Properties\AssemblyInfo.g.cs", + "src\DatabaseMigrationTools\Properties\AssemblyInfo.g.cs", + "src\GalleryTools\Properties\AssemblyInfo.g.cs", + "src\GitHubVulnerabilities2Db\Properties\AssemblyInfo.g.cs", + "src\GitHubVulnerabilities2v3\Properties\AssemblyInfo.g.cs", + "src\NuGet.Services.DatabaseMigration\Properties\AssemblyInfo.g.cs", + "src\NuGet.Services.Entities\Properties\AssemblyInfo.g.cs", + "src\NuGetGallery.Core\Properties\AssemblyInfo.g.cs", + "src\NuGetGallery.Services\Properties\AssemblyInfo.g.cs", + "src\NuGetGallery\Properties\AssemblyInfo.g.cs", + "src\VerifyMicrosoftPackage\Properties\AssemblyInfo.g.cs" + $GalleryAssemblyInfo | ForEach-Object { + Set-VersionInfo (Join-Path $PSScriptRoot $_) -AssemblyVersion $GalleryAssemblyVersion -PackageVersion $GalleryPackageVersion -Branch $Branch -Commit $CommitSHA + } + } ` + -ev +BuildErrors Invoke-BuildStep 'Removing .editorconfig file in NuGetGallery' { Remove-EditorconfigFile -Directory $PSScriptRoot } ` -ev +BuildErrors Invoke-BuildStep 'Building solution' { - $SolutionPath = Join-Path $PSScriptRoot "NuGetGallery.sln" - $MvcBuildViews = $Configuration -eq "release" - Build-Solution -Configuration $Configuration -BuildNumber $BuildNumber -SolutionPath $SolutionPath -SkipRestore:$SkipRestore -MSBuildProperties "/p:MvcBuildViews=$MvcBuildViews" ` -} ` --ev +BuildErrors + $SolutionPath = Join-Path $PSScriptRoot "NuGetGallery.sln" + $MvcBuildViews = $Configuration -eq "Release" + Build-Solution -Configuration $Configuration -BuildNumber $BuildNumber -SolutionPath $SolutionPath -SkipRestore:$SkipRestore -MSBuildProperties "/p:MvcBuildViews=$MvcBuildViews" ` + } ` + -ev +BuildErrors Invoke-BuildStep 'Signing the binaries' { - Sign-Binaries -Configuration $Configuration -BuildNumber $BuildNumber ` -} ` --ev +BuildErrors + Sign-Binaries -Configuration $Configuration -BuildNumber $BuildNumber ` + } ` + -ev +BuildErrors Invoke-BuildStep 'Creating artifacts' { ` - New-ProjectPackage (Join-Path $PSScriptRoot "src\NuGetGallery.Core\NuGetGallery.Core.csproj") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion -PackageId "NuGetGallery.Core$PackageSuffix" - New-ProjectPackage (Join-Path $PSScriptRoot "src\NuGet.Services.Entities\NuGet.Services.Entities.csproj") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion - New-ProjectPackage (Join-Path $PSScriptRoot "src\NuGet.Services.DatabaseMigration\NuGet.Services.DatabaseMigration.csproj") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion - New-ProjectPackage (Join-Path $PSScriptRoot "src\NuGetGallery.Services\NuGetGallery.Services.csproj") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion - New-Package (Join-Path $PSScriptRoot "src\DatabaseMigrationTools\DatabaseMigration.Gallery.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch - New-Package (Join-Path $PSScriptRoot "src\DatabaseMigrationTools\DatabaseMigration.SupportRequest.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch - New-Package (Join-Path $PSScriptRoot "src\DatabaseMigrationTools\DatabaseMigration.Validation.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch - New-Package (Join-Path $PSScriptRoot "src\AccountDeleter\Gallery.AccountDeleter.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch - New-Package (Join-Path $PSScriptRoot "src\GitHubVulnerabilities2Db\GitHubVulnerabilities2Db.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch - New-Package (Join-Path $PSScriptRoot "src\GitHubVulnerabilities2v3\GitHubVulnerabilities2v3.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch - New-Package (Join-Path $PSScriptRoot "src\GalleryTools\Gallery.GalleryTools.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch - New-Package (Join-Path $PSScriptRoot "src\VerifyGitHubVulnerabilities\VerifyGitHubVulnerabilities.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch - - if (!$VerifyMicrosoftPackageVersion) { $VerifyMicrosoftPackageVersion = $SemanticVersion } - New-Package (Join-Path $PSScriptRoot "src\VerifyMicrosoftPackage\VerifyMicrosoftPackage.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $VerifyMicrosoftPackageVersion -Branch $Branch -} ` --ev +BuildErrors + $GalleryProjects = + "src\NuGet.Services.DatabaseMigration\NuGet.Services.DatabaseMigration.csproj", + "src\NuGet.Services.Entities\NuGet.Services.Entities.csproj", + "src\NuGetGallery.Core\NuGetGallery.Core.csproj", + "src\NuGetGallery.Services\NuGetGallery.Services.csproj" + $GalleryProjects | ForEach-Object { + New-ProjectPackage (Join-Path $PSScriptRoot $_) -Configuration $Configuration -BuildNumber $BuildNumber -Version $GalleryPackageVersion -Branch $Branch -Symbols + } + + $GalleryNuspecProjects = + "src\DatabaseMigrationTools\DatabaseMigration.Gallery.nuspec", + "src\DatabaseMigrationTools\DatabaseMigration.SupportRequest.nuspec", + "src\DatabaseMigrationTools\DatabaseMigration.Validation.nuspec", + "src\AccountDeleter\Gallery.AccountDeleter.nuspec", + "src\GitHubVulnerabilities2Db\GitHubVulnerabilities2Db.nuspec", + "src\GitHubVulnerabilities2v3\GitHubVulnerabilities2v3.nuspec", + "src\GalleryTools\Gallery.GalleryTools.nuspec", + "src\VerifyGitHubVulnerabilities\VerifyGitHubVulnerabilities.nuspec" + $GalleryNuspecProjects | ForEach-Object { + New-Package (Join-Path $PSScriptRoot $_) -Configuration $Configuration -BuildNumber $BuildNumber -Version $GalleryPackageVersion -Branch $Branch + } + + if (!$VerifyMicrosoftPackageVersion) { $VerifyMicrosoftPackageVersion = $GalleryPackageVersion } + New-Package (Join-Path $PSScriptRoot "src\VerifyMicrosoftPackage\VerifyMicrosoftPackage.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $VerifyMicrosoftPackageVersion -Branch $Branch + } ` + -ev +BuildErrors Invoke-BuildStep 'Signing the packages' { - Sign-Packages -Configuration $Configuration -BuildNumber $BuildNumber ` -} ` --ev +BuildErrors + Sign-Packages -Configuration $Configuration -BuildNumber $BuildNumber ` + } ` + -ev +BuildErrors Trace-Log ('-' * 60) @@ -145,7 +140,7 @@ Trace-Log "Time elapsed $(Format-ElapsedTime ($endTime - $startTime))" Trace-Log ('=' * 60) if ($BuildErrors) { - $ErrorLines = $BuildErrors | %{ ">>> $($_.Exception.Message)" } + $ErrorLines = $BuildErrors | ForEach-Object { ">>> $($_.Exception.Message)" } Error-Log "Builds completed with $($BuildErrors.Count) error(s):`r`n$($ErrorLines -join "`r`n")" -Fatal } diff --git a/buildandtest.ps1 b/buildandtest.ps1 deleted file mode 100644 index 6962d44eeb..0000000000 --- a/buildandtest.ps1 +++ /dev/null @@ -1,17 +0,0 @@ -[CmdletBinding(DefaultParameterSetName='RegularBuild')] -param ( - [ValidateSet("debug", "release")] - [string]$Configuration = 'debug', - [int]$BuildNumber, - [switch]$SkipRestore, - [switch]$CleanCache, - [string]$SimpleVersion = '1.0.0', - [string]$SemanticVersion = '1.0.0-zlocal', - [string]$Branch, - [string]$CommitSHA -) - -$ScriptPath = Split-Path $MyInvocation.InvocationName - -& "$ScriptPath\build.ps1" -Configuration $Configuration -BuildNumber $BuildNumber -SkipRestore:$SkipRestore -CleanCache:$CleanCache -SimpleVersion "$SimpleVersion" -SemanticVersion "$SemanticVersion" -Branch "$Branch" -CommitSHA "$CommitSHA" -& "$ScriptPath\test.ps1" -Configuration $Configuration -BuildNumber $BuildNumber \ No newline at end of file diff --git a/content/DEV/Team.json b/content/DEV/Team.json index 77d9dd7672..a2b5e5cfd7 100644 --- a/content/DEV/Team.json +++ b/content/DEV/Team.json @@ -9,7 +9,7 @@ "agr", "alpaix", "anangaur", - "anurse", + "analogrelay", "bhuvak", "bsimser", "chenriksson", diff --git a/content/INT/Team.json b/content/INT/Team.json index 77d9dd7672..a2b5e5cfd7 100644 --- a/content/INT/Team.json +++ b/content/INT/Team.json @@ -9,7 +9,7 @@ "agr", "alpaix", "anangaur", - "anurse", + "analogrelay", "bhuvak", "bsimser", "chenriksson", diff --git a/content/PROD/Team.json b/content/PROD/Team.json index 77d9dd7672..a2b5e5cfd7 100644 --- a/content/PROD/Team.json +++ b/content/PROD/Team.json @@ -9,7 +9,7 @@ "agr", "alpaix", "anangaur", - "anurse", + "analogrelay", "bhuvak", "bsimser", "chenriksson", diff --git a/global.json b/global.json index 4ef0522356..32da22419b 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,7 @@ { "sdk": { - "version": "8.0.301", - "rollForward": "latestFeature" + "version": "8.0.303", + "rollForward": "latestFeature", + "allowPrerelease": false } } \ No newline at end of file diff --git a/packages.config b/packages.config new file mode 100644 index 0000000000..025d47f968 --- /dev/null +++ b/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/sign.thirdparty.props b/sign.thirdparty.props index 2989ea5af8..09feaa7601 100644 --- a/sign.thirdparty.props +++ b/sign.thirdparty.props @@ -1,5 +1,4 @@ - - + diff --git a/src/AccountDeleter/AccountDeleter.csproj b/src/AccountDeleter/AccountDeleter.csproj index a593ba641c..2d31f350a6 100644 --- a/src/AccountDeleter/AccountDeleter.csproj +++ b/src/AccountDeleter/AccountDeleter.csproj @@ -1,4 +1,4 @@ - + @@ -104,13 +104,10 @@ - 0.3.0 runtime; build; native; contentfiles; analyzers all - - $(NuGetJobsPackageVersion) - + diff --git a/src/DatabaseMigrationTools/DatabaseMigrationTools.csproj b/src/DatabaseMigrationTools/DatabaseMigrationTools.csproj index 1c13c1f062..52d0d8a3ad 100644 --- a/src/DatabaseMigrationTools/DatabaseMigrationTools.csproj +++ b/src/DatabaseMigrationTools/DatabaseMigrationTools.csproj @@ -56,17 +56,12 @@ - - 6.4.4 - + - 0.3.0 runtime; build; native; contentfiles; analyzers all - - $(ServerCommonPackageVersion) - + diff --git a/src/GalleryTools/GalleryTools.csproj b/src/GalleryTools/GalleryTools.csproj index f9d2d0fefc..0cb4854f34 100644 --- a/src/GalleryTools/GalleryTools.csproj +++ b/src/GalleryTools/GalleryTools.csproj @@ -86,23 +86,14 @@ - - 0.20.0 - + - 0.3.0 runtime; build; native; contentfiles; analyzers all - - 7.1.1 - - - 1.1.1 - - - 4.5.0 - + + + diff --git a/src/GitHubVulnerabilities2Db/GitHubVulnerabilities2Db.csproj b/src/GitHubVulnerabilities2Db/GitHubVulnerabilities2Db.csproj index 97f5f680ad..5e9aa3b417 100644 --- a/src/GitHubVulnerabilities2Db/GitHubVulnerabilities2Db.csproj +++ b/src/GitHubVulnerabilities2Db/GitHubVulnerabilities2Db.csproj @@ -1,4 +1,4 @@ - + @@ -66,16 +66,11 @@ - 0.3.0 runtime; build; native; contentfiles; analyzers all - - $(NuGetJobsPackageVersion) - - - $(ServerCommonPackageVersion) - + + diff --git a/src/GitHubVulnerabilities2v3/GitHubVulnerabilities2V3.csproj b/src/GitHubVulnerabilities2v3/GitHubVulnerabilities2V3.csproj index e334a00558..a656eb5bfa 100644 --- a/src/GitHubVulnerabilities2v3/GitHubVulnerabilities2V3.csproj +++ b/src/GitHubVulnerabilities2v3/GitHubVulnerabilities2V3.csproj @@ -1,4 +1,4 @@ - + @@ -64,16 +64,11 @@ - 0.3.0 runtime; build; native; contentfiles; analyzers all - - $(NuGetJobsPackageVersion) - - - $(ServerCommonPackageVersion) - + + diff --git a/src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj b/src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj index 03a2efad1d..bf6789c0dd 100644 --- a/src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj +++ b/src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj @@ -1,4 +1,4 @@ - + @@ -18,12 +18,6 @@ Core support library for NuGet database migration $(MSBuildProjectName) - .NET Foundation - https://github.com/NuGet/NuGetGallery/blob/master/LICENSE.txt - https://github.com/NuGet/NuGetGallery - © .NET Foundation. All rights reserved. - true - true true @@ -65,25 +59,17 @@ - - 6.4.4 - + - 0.3.0 runtime; build; native; contentfiles; analyzers all - $(NuGetClientPackageVersion) runtime; build; native; contentfiles; analyzers; buildtransitive all - - $(NuGetJobsPackageVersion) - - - 4.8.6 - + + diff --git a/src/NuGet.Services.Entities/NuGet.Services.Entities.csproj b/src/NuGet.Services.Entities/NuGet.Services.Entities.csproj index b84e0465a3..c9062fd53d 100644 --- a/src/NuGet.Services.Entities/NuGet.Services.Entities.csproj +++ b/src/NuGet.Services.Entities/NuGet.Services.Entities.csproj @@ -8,11 +8,11 @@ - - - + + + - + diff --git a/src/NuGet.Services.GitHub/NuGet.Services.GitHub.csproj b/src/NuGet.Services.GitHub/NuGet.Services.GitHub.csproj index c3ce46c7ef..dc61be618a 100644 --- a/src/NuGet.Services.GitHub/NuGet.Services.GitHub.csproj +++ b/src/NuGet.Services.GitHub/NuGet.Services.GitHub.csproj @@ -1,4 +1,3 @@ - @@ -9,9 +8,7 @@ - - $(ServerCommonPackageVersion) - + diff --git a/src/NuGetGallery.Core/NuGetGallery.Core.csproj b/src/NuGetGallery.Core/NuGetGallery.Core.csproj index 8e5d224d14..bf0f7470e7 100644 --- a/src/NuGetGallery.Core/NuGetGallery.Core.csproj +++ b/src/NuGetGallery.Core/NuGetGallery.Core.csproj @@ -41,34 +41,20 @@ - - - - - - $(NuGetClientPackageVersion) - - - $(ServerCommonPackageVersion) - + + + + + + - - $(ServerCommonPackageVersion) - - - $(ServerCommonPackageVersion) - - - $(ServerCommonPackageVersion) - - - 5.8.4 - - - 3.2.3 - + + + + + diff --git a/src/NuGetGallery.Services/NuGetGallery.Services.csproj b/src/NuGetGallery.Services/NuGetGallery.Services.csproj index 7c69fd8211..66293e52b3 100644 --- a/src/NuGetGallery.Services/NuGetGallery.Services.csproj +++ b/src/NuGetGallery.Services/NuGetGallery.Services.csproj @@ -1,4 +1,4 @@ - + @@ -54,54 +54,24 @@ - - 2.21.0 - + - - 5.2.3 - - - 1.0.0 - - - 7.3.1 - - - 4.2.2 - - - 4.2.2 - - - 4.2.2 - - - 4.2.2 - - - 4.2.2 - - - 4.2.2 - - - $(NuGetClientPackageVersion) - - - $(ServerCommonPackageVersion) - - - $(ServerCommonPackageVersion) - - - 0.2.0 - - - 4.3.1 - + + + + + + + + + + + + + + diff --git a/src/NuGetGallery/App_Data/Files/Content/Team.json b/src/NuGetGallery/App_Data/Files/Content/Team.json index d33225d959..89004e693d 100644 --- a/src/NuGetGallery/App_Data/Files/Content/Team.json +++ b/src/NuGetGallery/App_Data/Files/Content/Team.json @@ -9,8 +9,9 @@ "agr", "alpaix", "anangaur", - "anurse", + "analogrelay", "bhuvak", + "bsimser", "chenriksson", "claycompton", "cristinamanum", @@ -23,10 +24,12 @@ "diverdan92", "dotnetjunky", "drewgillies", + "drusellers", "dtivel", "emgarten", "ericstj", "feiling", + "ferventcoder", "half-ogre", "harikmenon", "harshgMSFT", @@ -47,6 +50,7 @@ "murilogr", "nkolev92", "osbornm", + "PatoBeltran", "pranavkm", "pspill", "rohit21agrawal", diff --git a/src/NuGetGallery/NuGetGallery.csproj b/src/NuGetGallery/NuGetGallery.csproj index 0f34c21709..80aee214b3 100644 --- a/src/NuGetGallery/NuGetGallery.csproj +++ b/src/NuGetGallery/NuGetGallery.csproj @@ -1,4 +1,4 @@ - + @@ -2135,194 +2135,71 @@ - - 4.3.1 - - - 7.0.0 - - - 2.2.0 - - - 2.2.0 - - - 1.2.0 - - - 4.6.2 - - - 4.0.2 - - - 4.0.1 - - - 4.2.0 - - - 4.1.0 - - - 0.15.1 - - - 5.4.0 - - - 0.3.0 - - - 1.2.2 - - - 1.2.2 - - - 6.4.4 - - - 3.0.3 - - - 3.0.3 - + + + + + + + + + + + + + + + + + + - 0.3.0 runtime; build; native; contentfiles; analyzers all - - 2.21.0 - - - 2.12.0 - - - 6.0.0 - - - 1.0.0 - - - 3.2.9 - - - 1.1.3 - - - 5.2.3 - - - 5.2.3 - - - 1.3.0 - - - 5.7.0 - - - 5.2.3 - - - 3.2.3 - - - 3.2.3 - - - 3.2.3 - - - 3.2.3 - - - 1.0.0 - - - 3.9.85 - - - 5.8.4 - - - 2.2.0 - - - 2.2.0 - - - 2.2.29 - - - 1.0.0 - - - 3.1.0 - - - 2.8.3 - - - 2.29.4 - - - 1.4.0 - - - $(ServerCommonPackageVersion) - - - $(ServerCommonPackageVersion) - - - $(ServerCommonPackageVersion) - - - 1.0.0 - - - 0.1.4237.2400 - - - 1.1.3 - - - 1.4.2 - - - 0.9.0 - - - 4.8.6 - - - 4.3.0 - - - 4.3.0 - - - 4.3.4 - - - 1.4.4 - - - 2.0.6 - - - 0.1.0 - - - 1.6.0 - - - 1.7.0 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/NuGetGallery/Web.config b/src/NuGetGallery/Web.config index 1b291f9311..3105589f3d 100644 --- a/src/NuGetGallery/Web.config +++ b/src/NuGetGallery/Web.config @@ -529,34 +529,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -601,10 +573,6 @@ - - - - @@ -617,6 +585,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -627,7 +615,7 @@ - + @@ -639,7 +627,7 @@ - + @@ -661,14 +649,22 @@ + + + + + + + + - + - \ No newline at end of file + diff --git a/src/VerifyGitHubVulnerabilities/VerifyGitHubVulnerabilities.csproj b/src/VerifyGitHubVulnerabilities/VerifyGitHubVulnerabilities.csproj index 3f6ea79a84..1d4a77a7ee 100644 --- a/src/VerifyGitHubVulnerabilities/VerifyGitHubVulnerabilities.csproj +++ b/src/VerifyGitHubVulnerabilities/VerifyGitHubVulnerabilities.csproj @@ -1,4 +1,4 @@ - + @@ -61,9 +61,7 @@ - - $(NuGetJobsPackageVersion) - + diff --git a/src/VerifyMicrosoftPackage/VerifyMicrosoftPackage.csproj b/src/VerifyMicrosoftPackage/VerifyMicrosoftPackage.csproj index fd08b74a58..81406dfa21 100644 --- a/src/VerifyMicrosoftPackage/VerifyMicrosoftPackage.csproj +++ b/src/VerifyMicrosoftPackage/VerifyMicrosoftPackage.csproj @@ -1,4 +1,4 @@ - + @@ -57,9 +57,7 @@ - - 1.1.1 - + {6262f4fc-29be-4226-b676-db391c89d396} NuGet.Services.Entities @@ -73,7 +71,6 @@ NuGetGallery.Services - 0.3.0 runtime; build; native; contentfiles; analyzers all diff --git a/test.ps1 b/test.ps1 index 71941f1d2f..13484dded8 100644 --- a/test.ps1 +++ b/test.ps1 @@ -21,7 +21,7 @@ Function Invoke-Tests { Trace-Log 'Running tests' - $xUnitExe = (Join-Path $PSScriptRoot "packages\xunit.runner.console\tools\xunit.console.exe") + $xUnitExe = (Join-Path $PSScriptRoot "packages\xunit.runner.console\tools\net472\xunit.console.exe") $GalleryTestAssemblies = ` "tests\AccountDeleter.Facts\bin\$Configuration\net472\AccountDeleter.Facts.dll", ` diff --git a/tests/AccountDeleter.Facts/AccountDeleter.Facts.csproj b/tests/AccountDeleter.Facts/AccountDeleter.Facts.csproj index 259457c5d0..784d59237e 100644 --- a/tests/AccountDeleter.Facts/AccountDeleter.Facts.csproj +++ b/tests/AccountDeleter.Facts/AccountDeleter.Facts.csproj @@ -1,4 +1,4 @@ - + net472 @@ -10,7 +10,7 @@ - - + + \ No newline at end of file diff --git a/tests/GitHubVulnerabilities2Db.Facts/GitHubVulnerabilities2Db.Facts.csproj b/tests/GitHubVulnerabilities2Db.Facts/GitHubVulnerabilities2Db.Facts.csproj index b4b2909fa5..4a40d44ded 100644 --- a/tests/GitHubVulnerabilities2Db.Facts/GitHubVulnerabilities2Db.Facts.csproj +++ b/tests/GitHubVulnerabilities2Db.Facts/GitHubVulnerabilities2Db.Facts.csproj @@ -1,4 +1,4 @@ - + net472 @@ -9,7 +9,7 @@ - - + + \ No newline at end of file diff --git a/tests/GitHubVulnerabilities2v3.Facts/GitHubVulnerabilities2v3.Facts.csproj b/tests/GitHubVulnerabilities2v3.Facts/GitHubVulnerabilities2v3.Facts.csproj index af19e1395d..87c482e8a4 100644 --- a/tests/GitHubVulnerabilities2v3.Facts/GitHubVulnerabilities2v3.Facts.csproj +++ b/tests/GitHubVulnerabilities2v3.Facts/GitHubVulnerabilities2v3.Facts.csproj @@ -1,4 +1,4 @@ - + @@ -68,8 +68,8 @@ - - + + \ No newline at end of file diff --git a/tests/NuGet.Services.DatabaseMigration.Facts/NuGet.Services.DatabaseMigration.Facts.csproj b/tests/NuGet.Services.DatabaseMigration.Facts/NuGet.Services.DatabaseMigration.Facts.csproj index d30abe7cdb..05f4400d3e 100644 --- a/tests/NuGet.Services.DatabaseMigration.Facts/NuGet.Services.DatabaseMigration.Facts.csproj +++ b/tests/NuGet.Services.DatabaseMigration.Facts/NuGet.Services.DatabaseMigration.Facts.csproj @@ -1,4 +1,4 @@ - + net472 @@ -6,9 +6,9 @@ - - - + + + runtime; build; native; contentfiles; analyzers all diff --git a/tests/NuGet.Services.Entities.Tests/NuGet.Services.Entities.Tests.csproj b/tests/NuGet.Services.Entities.Tests/NuGet.Services.Entities.Tests.csproj index 50b4b88f1a..1d6e987c7b 100644 --- a/tests/NuGet.Services.Entities.Tests/NuGet.Services.Entities.Tests.csproj +++ b/tests/NuGet.Services.Entities.Tests/NuGet.Services.Entities.Tests.csproj @@ -1,4 +1,4 @@ - + net472 @@ -6,8 +6,8 @@ - - + + runtime; build; native; contentfiles; analyzers all diff --git a/tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj b/tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj index bf9a20d1c2..74212e981a 100644 --- a/tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj +++ b/tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj @@ -1,4 +1,4 @@ - + Debug @@ -144,9 +144,9 @@ - - - + + + runtime; build; native; contentfiles analyzers all diff --git a/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj b/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj index 1e5077e996..a30f5d9558 100644 --- a/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj +++ b/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj @@ -1,4 +1,4 @@ - + Debug @@ -367,10 +367,10 @@ - - - - + + + + runtime; build; native; contentfiles analyzers all diff --git a/tests/NuGetGallery.FunctionalTests.Core/NuGetGallery.FunctionalTests.Core.csproj b/tests/NuGetGallery.FunctionalTests.Core/NuGetGallery.FunctionalTests.Core.csproj index a5f0a9fda4..3a6c85be1d 100644 --- a/tests/NuGetGallery.FunctionalTests.Core/NuGetGallery.FunctionalTests.Core.csproj +++ b/tests/NuGetGallery.FunctionalTests.Core/NuGetGallery.FunctionalTests.Core.csproj @@ -1,4 +1,4 @@ - + @@ -71,24 +71,12 @@ - - 2.2.0 - - - 2.1.1 - - - 2.8.6 - - - 2.94.0 - - - $(NuGetClientPackageVersion) - - - 2.9.0 - + + + + + + 2.8.2 runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj b/tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj index 5089dfe956..71b7bf1088 100644 --- a/tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj +++ b/tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj @@ -1,4 +1,4 @@ - + @@ -87,20 +87,11 @@ - - 1.0.0.10 - - - $(NuGetClientPackageVersion) - - - 4.5.0 - - - 2.9.0 - + + + + - 2.8.2 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/NuGetGallery.LoadTests/NuGetGallery.LoadTests.csproj b/tests/NuGetGallery.LoadTests/NuGetGallery.LoadTests.csproj index e641c3d4e5..41af51bc61 100644 --- a/tests/NuGetGallery.LoadTests/NuGetGallery.LoadTests.csproj +++ b/tests/NuGetGallery.LoadTests/NuGetGallery.LoadTests.csproj @@ -1,4 +1,4 @@ - + Debug @@ -97,12 +97,8 @@ - - 1.0.0.10 - - - 13.0.1 - + + diff --git a/tests/Scripts/DownloadLatestNuGetExeRelease.ps1 b/tests/Scripts/DownloadLatestNuGetExeRelease.ps1 index 5e80fecce2..fcee108aa5 100644 --- a/tests/Scripts/DownloadLatestNuGetExeRelease.ps1 +++ b/tests/Scripts/DownloadLatestNuGetExeRelease.ps1 @@ -1,6 +1,6 @@ [CmdletBinding()] param( - [Parameter(Mandatory)][string]$Directory + [string]$Directory = "." ) $targetNugetExePath = "$Directory\nuget.exe" @@ -12,6 +12,6 @@ if (Test-Path $targetNugetExePath) { Write-Host "nuget.exe not found in $Directory" -$sourceNugetExeUrl = "https://dist.nuget.org/win-x86-commandline/v6.7.0/nuget.exe" +$sourceNugetExeUrl = "https://dist.nuget.org/win-x86-commandline/v6.10.1/nuget.exe" Write-Host "Downloading nuget.exe from $sourceNugetExeUrl" Invoke-WebRequest $sourceNugetExeUrl -OutFile $targetNugetExePath diff --git a/tests/VerifyMicrosoftPackage.Facts/VerifyMicrosoftPackage.Facts.csproj b/tests/VerifyMicrosoftPackage.Facts/VerifyMicrosoftPackage.Facts.csproj index aa6f7332e3..e38457efb3 100644 --- a/tests/VerifyMicrosoftPackage.Facts/VerifyMicrosoftPackage.Facts.csproj +++ b/tests/VerifyMicrosoftPackage.Facts/VerifyMicrosoftPackage.Facts.csproj @@ -66,11 +66,8 @@ - - 2.9.0 - + - 2.8.2 runtime; build; native; contentfiles; analyzers all diff --git a/tools/Clean-Branches.ps1 b/tools/Clean-Branches.ps1 deleted file mode 100644 index a620bd6342..0000000000 --- a/tools/Clean-Branches.ps1 +++ /dev/null @@ -1,19 +0,0 @@ -param([switch]$Force) - -$toClean = & "$PSScriptRoot\Get-MergedBranches.ps1" - -$pushargs = @($toClean | foreach { ":$_" }) -if($Force) { - git push origin @pushargs -} else { - Write-Host "Pushing with -n (dry-run) without -Force parameter" - git push origin -n @pushargs -} - -$toClean | foreach { - if($Force) { - git branch -D $_ - } else { - "Would delete local branch: $_" - } -} \ No newline at end of file diff --git a/tools/Get-BranchSummary.ps1 b/tools/Get-BranchSummary.ps1 deleted file mode 100644 index 54128223bc..0000000000 --- a/tools/Get-BranchSummary.ps1 +++ /dev/null @@ -1,22 +0,0 @@ -param([DateTime]$Before) -Write-Host "Calculating summary, this may take a few seconds..." -git branch -r | - foreach { $_.Trim() } | - where { ($_ -notlike "origin/pr/*") -and ($_ -notlike "origin/HEAD*") } | - foreach { $_.Substring("origin/".Length) } | - foreach { - $log = (git log "origin/$_" -n1 --oneline) - $chunks = $log.Split(" ") - $commit = $chunks[0] - $comment = [String]::Join(" ", $chunks[1..($chunks.Length-1)]) - $obj = New-Object PSCustomObject - Add-Member -InputObject $obj -NotePropertyMembers @{ - "Name" = $_; - "Commit" = $commit; - "Comment" = $comment; - "Date" = [DateTime](@(git show -s --format=%ci $commit)[0]); - } - $obj - } | - sort Date | - where { (!$Before) -or ($_.Date -lt $Before) } diff --git a/tools/Get-MergedBranches.ps1 b/tools/Get-MergedBranches.ps1 deleted file mode 100644 index f539e50c59..0000000000 --- a/tools/Get-MergedBranches.ps1 +++ /dev/null @@ -1,13 +0,0 @@ -param([string]$ParentBranch = "master") - -git branch --merged "origin/$ParentBranch" -r | - foreach { $_.Trim() } | - where { $_ -like "origin*" } | - where { - ($_ -notlike "origin/pr*") -and - ($_ -notlike "origin/HEAD*") -and - (@("origin/master") -notcontains $_) - } | - foreach { - $_.Substring("origin/".Length) - } \ No newline at end of file diff --git a/tools/Update-Databases.ps1 b/tools/Update-Databases.ps1 index a9d64b07b7..04a1a65049 100644 --- a/tools/Update-Databases.ps1 +++ b/tools/Update-Databases.ps1 @@ -13,10 +13,10 @@ function Initialize-EF6Exe() { } if (!$efDirectory) { - # Read the current version of EntityFramework from NuGetGallery.csproj so that we can find the tools. - $csprojPath = Join-Path $PSScriptRoot "..\src\NuGetGallery\NuGetGallery.csproj" - [xml]$csproj = Get-Content $csprojPath - $efPackageReference = Select-Xml -Xml $csproj -XPath "//*[local-name()='PackageReference']" ` + # Read the current version of EntityFramework so that we can find the tools. + $cpmPath = Join-Path $PSScriptRoot "..\Directory.Packages.props" + [xml]$cpm = Get-Content $cpmPath + $efPackageReference = Select-Xml -Xml $cpm -XPath "//*[local-name()='PackageVersion']" ` | Where-Object { $_.Node.Attributes["Include"].Value -eq "EntityFramework" } $efVersion = $efPackageReference.Node.Version Write-Host "Using EntityFramework version $efVersion." @@ -75,7 +75,7 @@ try { -MigrationTargets $MigrationTargets } finally { - if ($ef6ExeDirectory -ne $null -and (Test-Path -Path $ef6ExeDirectory -PathType Container)) { + if ($null -ne $ef6ExeDirectory -and (Test-Path -Path $ef6ExeDirectory -PathType Container)) { Remove-Item -Path $ef6ExeDirectory -Recurse -Force } } diff --git a/tools/Upload-Blob.ps1 b/tools/Upload-Blob.ps1 deleted file mode 100644 index df2e528553..0000000000 --- a/tools/Upload-Blob.ps1 +++ /dev/null @@ -1,32 +0,0 @@ -param( - [string]$File, - [string]$ConnectionString, - [string]$Container, - [string]$Path) - -$ScriptPath = Split-Path -Parent $MyInvocation.MyCommand.Path -$asm = (dir $ScriptPath\..\packages\WindowsAzure.Storage.*\lib\net40\Microsoft.WindowsAzure.Storage.dll | select -first 1 -expand FullName) -[Reflection.Assembly]::LoadFrom($asm) | Out-Null - -$account = [Microsoft.WindowsAzure.Storage.CloudStorageAccount]::Parse($ConnectionString); -$client = $account.CreateCloudBlobClient() -$containerRef = $client.GetContainerReference($Container) -$containerRef.CreateIfNotExists() | Out-Null - -if($Path -and !$Path.EndsWith("/")) { - $Path += "/"; -} - -$blobName = $Path + [IO.Path]::GetFileName($File) -$blob = $containerRef.GetBlockBlobReference($blobName) - -try { - $strm = [IO.File]::OpenRead((Convert-Path $File)) - Write-Host "Uploading..." - $blob.UploadFromStream($strm) - Write-Host "Uploaded!" -} finally { - if($strm) { - $strm.Dispose() - } -} \ No newline at end of file