Merge branch 'dev' (#76)

NuGet · Mar 11, 2019 · e5d8ee2 · e5d8ee2
2 parents 0f06e4c + 7a2198e
commit e5d8ee2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -9,7 +9,7 @@ param (
     [string]$SemanticVersion = '1.0.0-zlocal',
     [string]$Branch,
     [string]$CommitSHA,
-    [string]$BuildBranch = '1c8734ee61e209f159972ab974784ba55ee2bd6d'
+    [string]$BuildBranch = 'ed30a6392ef7c342ca46b20f7b9c964ab9ad5881'
 )
 
 $msBuildVersion = 15;

diff --git a/src/NuGet.Server.Core/NuGet.Server.Core.nuspec b/src/NuGet.Server.Core/NuGet.Server.Core.nuspec
@@ -4,11 +4,11 @@
     <id>$id$</id>
     <version>$version$</version>
     <description>$description$</description>
-    <authors>.NET Foundation</authors>
-    <owners>$author$</owners>
-    <licenseUrl>https://raw.githubusercontent.com/NuGet/NuGet.Server/dev/LICENSE.txt</licenseUrl>
+    <authors>Microsoft</authors>
+    <owners>Microsoft</owners>
+    <license type="expression">Apache-2.0</license>
     <projectUrl>https://github.com/NuGet/NuGet.Server</projectUrl>
-    <copyright>$copyright$</copyright>
+    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <repository type="git" url="https://github.com/NuGet/NuGet.Server" />
     <frameworkAssemblies>
       <frameworkAssembly assemblyName="System.Data.Services" targetFramework="net46" />

diff --git a/src/NuGet.Server.V2/NuGet.Server.V2.nuspec b/src/NuGet.Server.V2/NuGet.Server.V2.nuspec
@@ -4,11 +4,11 @@
     <id>$id$</id>
     <version>$version$</version>
     <description>$description$</description>
-    <authors>.NET Foundation</authors>
-    <owners>$author$</owners>
-    <licenseUrl>https://raw.githubusercontent.com/NuGet/NuGet.Server/dev/LICENSE.txt</licenseUrl>
+    <authors>Microsoft</authors>
+    <owners>Microsoft</owners>
+    <license type="expression">Apache-2.0</license>
     <projectUrl>https://github.com/NuGet/NuGet.Server</projectUrl>
-    <copyright>$copyright$</copyright>
+    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <repository type="git" url="https://github.com/NuGet/NuGet.Server" />
     <frameworkAssemblies>
       <frameworkAssembly assemblyName="System.Data.Services" targetFramework="net46" />

diff --git a/src/NuGet.Server/NuGet.Server.nuspec b/src/NuGet.Server/NuGet.Server.nuspec
@@ -4,11 +4,11 @@
     <id>NuGet.Server</id>
     <version>$version$</version>
     <description>Web Application used to host a simple NuGet feed</description>
-    <authors>.NET Foundation</authors>
-    <owners>.NET Foundation</owners>
-    <licenseUrl>https://raw.githubusercontent.com/NuGet/NuGet.Server/dev/LICENSE.txt</licenseUrl>
+    <authors>Microsoft</authors>
+    <owners>Microsoft</owners>
+    <license type="expression">Apache-2.0</license>
     <projectUrl>https://github.com/NuGet/NuGet.Server</projectUrl>
-    <copyright>© .NET Foundation. All rights reserved.</copyright>
+    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <repository type="git" url="https://github.com/NuGet/NuGet.Server" />
     <frameworkAssemblies>
       <frameworkAssembly assemblyName="System.ServiceModel" targetFramework="net46" />