Permalink
Browse files

Merge pull request #3597 from NuGet/dev

Merging Dev into Master
2 parents b20eaac + a151dae commit 58a7b3fa8d80904112ba3e153d7be843232f5990 @ryuyu ryuyu committed on GitHub Feb 25, 2017
Showing with 936 additions and 861 deletions.
  1. +5 −1 .gitignore
  2. +24 −0 Deploy-StaticContent.ps1
  3. +17 −20 build.ps1
  4. +1 −3 buildandtest.ps1
  5. +24 −1 content/PROD/Team.json
  6. +1 −1 src/NuGetGallery.Core/Auditing/CloudAuditingService.cs
  7. +23 −23 src/NuGetGallery.Core/{Strings.Designer.cs → CoreStrings.Designer.cs}
  8. +174 −174 src/NuGetGallery.Core/{Strings.resx → CoreStrings.resx}
  9. +9 −10 src/NuGetGallery.Core/NuGetGallery.Core.csproj
  10. +12 −12 src/NuGetGallery.Core/Packaging/ManifestValidator.cs
  11. +3 −3 src/NuGetGallery.Core/Packaging/NupkgRewriter.cs
  12. +1 −1 src/NuGetGallery.Core/Packaging/PackageMetadata.cs
  13. +0 −1 src/NuGetGallery.Core/Properties/AssemblyInfo.cs
  14. +0 −1 src/NuGetGallery.Core/packages.config
  15. +27 −32 src/NuGetGallery/ApplicationInsights.config
  16. +3 −7 src/NuGetGallery/Authentication/AuthenticationService.cs
  17. +0 −5 src/NuGetGallery/Authentication/Providers/AuthenticatorUI.cs
  18. +6 −0 src/NuGetGallery/Content/PageStylings.css
  19. +21 −4 src/NuGetGallery/Content/Site.css
  20. +7 −6 src/NuGetGallery/Controllers/AppController.cs
  21. +0 −26 src/NuGetGallery/Controllers/UsersController.cs
  22. +18 −21 src/NuGetGallery/NuGetGallery.csproj
  23. +53 −10 src/NuGetGallery/Services/MessageService.cs
  24. +3 −3 src/NuGetGallery/Services/PackageNamingConflictValidator.cs
  25. +28 −1 src/NuGetGallery/Strings.Designer.cs
  26. +10 −1 src/NuGetGallery/Strings.resx
  27. +3 −0 src/NuGetGallery/Views/Packages/Edit.cshtml
  28. +18 −15 src/NuGetGallery/Views/Pages/Contact.cshtml
  29. +2 −2 src/NuGetGallery/Views/Shared/LayoutFooter.cshtml
  30. +44 −86 src/NuGetGallery/Views/Users/ApiKeys.cshtml
  31. +8 −2 src/NuGetGallery/Web.config
  32. +8 −7 src/NuGetGallery/packages.config
  33. +15 −15 tests/NuGetGallery.Core.Facts/Packaging/ManifestValidatorFacts.cs
  34. +1 −50 tests/NuGetGallery.Facts/Authentication/AuthenticationServiceFacts.cs
  35. +1 −1 tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs
  36. +1 −1 tests/NuGetGallery.Facts/Controllers/AppControllerFacts.cs
  37. +1 −1 tests/NuGetGallery.Facts/Controllers/CuratedFeedsControllerFacts.cs
  38. +1 −1 tests/NuGetGallery.Facts/Controllers/CuratedPackagesControllerFacts.cs
  39. +1 −2 tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
  40. +0 −56 tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs
  41. +1 −2 tests/NuGetGallery.Facts/Framework/TestContainer.cs
  42. +61 −11 tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs
  43. +72 −15 tests/NuGetGallery.Facts/Services/PackageNamingConflictValidatorFacts.cs
  44. +2 −1 tests/NuGetGallery.FunctionalTests.Core/EnvironmentSettings.cs
  45. +53 −41 tests/NuGetGallery.FunctionalTests.Core/Helpers/ClientSdkHelper.cs
  46. +6 −6 tests/NuGetGallery.FunctionalTests/Commandline/PackageVersionTest.cs
  47. +0 −97 tests/NuGetGallery.FunctionalTests/ODataFeeds/CuratedFeedTest.cs
  48. +26 −4 tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs
  49. +1 −1 tests/NuGetGallery.LoadTests/NuGetGallery.LoadTests.csproj
  50. +4 −5 tests/NuGetGallery.WebUITests.P1/BasicPages/StatisticsPageTest.cs
  51. +16 −20 tests/NuGetGallery.WebUITests.P2/BasicPages/SecurityHeaderTest.cs
  52. +43 −0 tests/Scripts/Configure-FunctionalTests.ps1
  53. +15 −11 tests/Scripts/RunEverything.cmd
  54. +16 −11 tests/Scripts/RunP0Tests.bat
  55. +19 −11 tests/Scripts/RunP1Tests.bat
  56. +19 −11 tests/Scripts/RunP2Tests.bat
  57. +8 −8 tests/Scripts/RunReadonlyModeTests.bat
View
@@ -27,6 +27,9 @@ x64/
build/
tools/
.nuget/CredentialProviderBundle.zip
+.nuget/CredentialProvider.VSS.exe
+.nuget/EULA_Microsoft Visual Studio Team Services Credential Provider.docx
+.nuget/ThirdPartyNotices.txt
AssemblyInfo.g.cs
# MSTest test Results
@@ -175,7 +178,7 @@ build/artifacts/
tests/Scripts/TestResults[*].trx
src/NuGetGallery.Cloud/ecf/
*.trx
-tests/functionaltests*.html
+tests/functionaltests.*.xml
Results.?.xml
# Vs2015
@@ -185,3 +188,4 @@ Results.?.xml
.vs/config/applicationhost.config
src/NuGetGallery/App_Data/Files/auditing/
artifacts/
+.vs
@@ -0,0 +1,24 @@
+[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'."
+}
View
@@ -2,16 +2,14 @@
param (
[ValidateSet("debug", "release")]
[string]$Configuration = 'debug',
- [ValidateSet("Release","rtm", "rc", "beta", "beta2", "final", "xprivate", "zlocal")]
- [string]$ReleaseLabel = 'zlocal',
[int]$BuildNumber,
[switch]$SkipRestore,
[switch]$CleanCache,
[string]$SimpleVersion = '1.0.0',
[string]$SemanticVersion = '1.0.0-zlocal',
[string]$Branch,
[string]$CommitSHA,
- [string]$BuildBranch = 'da881231d9ae9c966d0c18824f09f0122008e765'
+ [string]$BuildBranch = '1c479a7381ebbc0fe1fded765de70d513b8bd68e'
)
# For TeamCity - If any issue occurs, this script fail the build. - By default, TeamCity returns an exit code of 0 for all powershell scripts, even if they fail
@@ -27,7 +25,7 @@ if (-not (Test-Path "$PSScriptRoot/build")) {
New-Item -Path "$PSScriptRoot/build" -ItemType "directory"
}
wget -UseBasicParsing -Uri "https://raw.githubusercontent.com/NuGet/ServerCommon/$BuildBranch/build/init.ps1" -OutFile "$PSScriptRoot/build/init.ps1"
-. "$PSScriptRoot/build/init.ps1" -Branch "$BuildBranch"
+. "$PSScriptRoot/build/init.ps1" -BuildBranch "$BuildBranch"
Function Clean-Tests {
[CmdletBinding()]
@@ -49,6 +47,9 @@ Trace-Log "Build #$BuildNumber started at $startTime"
$BuildErrors = @()
+Invoke-BuildStep 'Getting private build tools' { Install-PrivateBuildTools } `
+ -ev +BuildErrors
+
Invoke-BuildStep 'Cleaning test results' { Clean-Tests } `
-ev +BuildErrors
@@ -67,29 +68,25 @@ Invoke-BuildStep 'Restoring solution packages' { `
-skip:$SkipRestore `
-ev +BuildErrors
-Invoke-BuildStep 'Set version metadata in AssemblyInfo.cs' { `
- param($Path, $Version, $Branch, $Commit)
- Set-VersionInfo -Path $Path -Version $Version -Branch $Branch -Commit $Commit `
- } `
- -args (Join-Path $PSScriptRoot "src\NuGetGallery\Properties\AssemblyInfo.g.cs"), $SimpleVersion, $Branch, $CommitSHA `
- -ev +BuildErrors
-
-Invoke-BuildStep 'Set version metadata in AssemblyInfo.cs' { `
- param($Path, $Version, $Branch, $Commit)
- Set-VersionInfo -Path $Path -Version $Version -Branch $Branch -Commit $Commit `
+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")
+
+ Foreach ($Path in $Paths) {
+ Set-VersionInfo -Path $Path -Version $SimpleVersion -Branch $Branch -Commit $CommitSHA
+ }
} `
- -args (Join-Path $PSScriptRoot "src\NuGetGallery.Core\Properties\AssemblyInfo.g.cs"), $SimpleVersion, $Branch, $CommitSHA `
-ev +BuildErrors
-
+
Invoke-BuildStep 'Building solution' {
- param($Configuration, $BuildNumber, $SolutionPath, $SkipRestore)
- Build-Solution $Configuration $BuildNumber -MSBuildVersion "14" $SolutionPath -SkipRestore:$SkipRestore -MSBuildProperties "/p:MvcBuildViews=true" `
+ $SolutionPath = Join-Path $PSScriptRoot "NuGetGallery.sln"
+ Build-Solution $Configuration $BuildNumber -MSBuildVersion "14" $SolutionPath -SkipRestore:$SkipRestore -MSBuildProperties "/p:MvcBuildViews=true" `
} `
- -args $Configuration, $BuildNumber, (Join-Path $PSScriptRoot "NuGetGallery.sln"), $SkipRestore `
-ev +BuildErrors
Invoke-BuildStep 'Creating artifacts' {
- New-Package (Join-Path $PSScriptRoot "src\NuGetGallery.Core\NuGetGallery.Core.csproj") -Configuration $Configuration -BuildNumber $BuildNumber -ReleaseLabel $ReleaseLabel -Version $SemanticVersion `
+ New-Package (Join-Path $PSScriptRoot "src\NuGetGallery.Core\NuGetGallery.Core.csproj") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion `
-ev +BuildErrors
}
View
@@ -2,8 +2,6 @@
param (
[ValidateSet("debug", "release")]
[string]$Configuration = 'debug',
- [ValidateSet("Release","rtm", "rc", "beta", "beta2", "final", "xprivate", "zlocal")]
- [string]$ReleaseLabel = 'zlocal',
[int]$BuildNumber,
[switch]$SkipRestore,
[switch]$CleanCache,
@@ -15,5 +13,5 @@ param (
$ScriptPath = Split-Path $MyInvocation.InvocationName
-& "$ScriptPath\build.ps1" -Configuration $Configuration -ReleaseLabel $ReleaseLabel -BuildNumber $BuildNumber -SkipRestore:$SkipRestore -CleanCache:$CleanCache -SimpleVersion "$SimpleVersion" -SemanticVersion "$SemanticVersion" -Branch "$Branch" -CommitSHA "$CommitSHA"
+& "$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
@@ -24,5 +24,28 @@
"sblom",
"zhili1208",
"xavierdecoster",
- "maartenba"
+ "maartenba",
+ "scottbommarito",
+ "joelverhagen",
+ "shishirx34",
+ "ryuyu",
+ "skofman1",
+ "chenriksson",
+ "cristinamanum",
+ "alpaix",
+ "anangaur",
+ "diverdan92",
+ "DoRonMotter",
+ "drewgillies",
+ "dtivel",
+ "ericstj",
+ "jainaashish",
+ "jasonmalinowski",
+ "jonwchu",
+ "karann-msft",
+ "mishra14",
+ "nkolev92",
+ "rohit21agrawal",
+ "rrelyea",
+ "yishaigalatzer"
]
@@ -160,7 +160,7 @@ private static CloudBlobContainer GetContainer(string storageConnectionString)
// Blob already existed!
throw new InvalidOperationException(String.Format(
CultureInfo.CurrentCulture,
- Strings.CloudAuditingService_DuplicateAuditRecord,
+ CoreStrings.CloudAuditingService_DuplicateAuditRecord,
fullPath));
}
throw;
Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 58a7b3f

Please sign in to comment.