Skip to content

Commit

Permalink
Merge official NugetGallery tag 'v2017.03.27' into feature/merge_v201…
Browse files Browse the repository at this point in the history
…7.03.27

* tag 'v2017.03.27': (205 commits)
  Revert UpdateIsLatest optimistic concurrency changes (NuGet#3707)
  UpdateIsLatest concurrent unlist fix (NuGet#3695)
  Change telemetry time to use correct format (NuGet#3690)
  Fix typo of "publically" (NuGet#3636)
  Fix regression (NuGet#3667)
  Add credential to Register and RequestPasswordReset audits (NuGet#3666)
  Functional test for temp keys (NuGet#3664)
  Telemetry for temp keys (NuGet#3662)
  Temp keys implementation (NuGet#3563) (NuGet#3646)
  Extracting code: single type per file (NuGet#3644)
  Telemetry for package push (NuGet#3649)
  Upgrade to NuGet.* v4.0.0 dependencies (NuGet#3643)
  Fix concurrent push test by disabling search hijacking on feed (NuGet#3641)
  Fixing Package Description truncation (NuGet#3638)
  Fix Microsoft Account removal (NuGet#3639)
  Send e-mail when a new API key is created (NuGet#3634)
  IsLatest Fix: wrong connection string passed to retry context (NuGet#3632)
  Update WindowsAzure.Storage to 7.0.0 (NuGet#3633)
  Depend on signed version of Elmah (NuGet#3609)
  Move AzureEntityList and TableErrorLog to NuGetGallery.Core (NuGet#3607)
  ...
  • Loading branch information
jozefizso committed Mar 31, 2017
2 parents bff57c9 + 9ccd227 commit 83034eb
Show file tree
Hide file tree
Showing 658 changed files with 20,523 additions and 21,924 deletions.
25 changes: 19 additions & 6 deletions .gitignore
Expand Up @@ -17,14 +17,21 @@ Packages.dgml
*.sln.docstates

# Build results

[Dd]ebug/
[Rr]elease/
x64/
#build/ # We use this folder for our Build Scripts
[Bb]in/
[Oo]bj/

# Files created and used by our build scripts
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
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
Expand Down Expand Up @@ -149,7 +156,7 @@ Desktop.ini
# Recycle Bin used on file shares
$RECYCLE.BIN/

# Mac crap
# Mac
.DS_Store

# NuGetGallery Specific Ignores
Expand All @@ -160,8 +167,6 @@ src/NuGetGallery/App_Data/Mail
src/NuGetGallery/App_Data/Lucene
!src/NuGetGallery/Views/Packages/
!src/NuGetGallery/Branding/Views/Packages/
!src/NuGetGallery.Operations/Tasks/Backups/
!src/NuGetGallery.Cloud/*Content/bin

# Kudu build folder
build/artifacts/
Expand All @@ -171,6 +176,14 @@ build/artifacts/
tests/Scripts/TestResults[*].trx
src/NuGetGallery.Cloud/ecf/
*.trx
tests/functionaltests.*.xml
Results.?.xml

# Vs2015
.vs/config/applicationhost.config
# The applicationhost.config is ignored, but already comitted on purpose
# Reason: The localtest.me setting needs to be configured in the <sites>-section.
# See ReadMe.md for more information
.vs/config/applicationhost.config
src/NuGetGallery/App_Data/Files/auditing/
artifacts/
.vs
4 changes: 3 additions & 1 deletion .nuget/packages.config
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="xunit.runner.visualstudio" version="2.0.1" />
<package id="Microsoft.CodeAnalysis.BinSkim" version="1.3.6" />
<package id="xunit.runner.console" version="2.1.0" />
<package id="xunit.runner.visualstudio" version="2.1.0" />
</packages>
239 changes: 0 additions & 239 deletions Changelog.md

This file was deleted.

24 changes: 24 additions & 0 deletions Deploy-StaticContent.ps1
@@ -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'."
}
42 changes: 0 additions & 42 deletions NuGet.Cloud.targets

This file was deleted.

5 changes: 3 additions & 2 deletions NuGet.config
Expand Up @@ -8,8 +8,9 @@
<add key="automatic" value="True" />
</packageRestore>
<packageSources>
<add key="v2.nuget.org" value="https://nuget.org/api/v2" />
<add key="nugetbuild" value="https://www.myget.org/F/nugetbuild/api/v2/" />
<add key="nuget" value="https://api.nuget.org/v3/index.json" />
<add key="nugetbuild" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
<add key="dotnetcore" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
</packageSources>
<activePackageSource>
<add key="All" value="(Aggregate source)" />
Expand Down

0 comments on commit 83034eb

Please sign in to comment.