Clean up build infra to make a repository merge easier

.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

Directory.Build.props

@@ -1,14 +1,30 @@
 <Project>
   <PropertyGroup>
+    <Authors>.NET Foundation</Authors>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/NuGet/NuGetGallery</PackageProjectUrl>
+    <Copyright>© .NET Foundation. All rights reserved.</Copyright>
+    <Company>.NET Foundation</Company>
+    <NeutralLanguage>en-US</NeutralLanguage>
+
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols Condition="'$(IncludeSymbols)' == ''">true</IncludeSymbols>
+    <SymbolPackageFormat Condition="'$(SymbolPackageFormat)' == ''">snupkg</SymbolPackageFormat>
     <LangVersion>9.0</LangVersion>
 
-    <NuGetClientPackageVersion>6.9.1</NuGetClientPackageVersion>
-    <ServerCommonPackageVersion>2.120.0</ServerCommonPackageVersion>
-    <NuGetJobsPackageVersion>4.3.0-agr-gal-stsdk-9768098</NuGetJobsPackageVersion>
+    <!--
+      Our builds generate a file containing the desired assembly version attributes.
+      To prevent duplicate attribute compilation errors, disable the SDK's attributes.
+      See: https://github.com/dotnet/sdk/blob/2df7f13c8c25e36e3620b62a420bc6b733e5bbb4/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.GenerateAssemblyInfo.targets#L65-L99
+    -->
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
   </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
-      <Version>8.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

Directory.Packages.props

@@ -0,0 +1,120 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
+    <EnablePackageVersionOverride>false</EnablePackageVersionOverride>
+
+    <NuGetClientPackageVersion>6.9.1</NuGetClientPackageVersion>
+    <ServerCommonPackageVersion>2.120.0</ServerCommonPackageVersion>
+    <NuGetJobsPackageVersion>4.3.0-agr-gal-stsdk-9768098</NuGetJobsPackageVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="4.4.0" />
+    <PackageVersion Include="Autofac.Mvc5.Owin" Version="4.0.1" />
+    <PackageVersion Include="Autofac.Mvc5" Version="4.0.2" />
+    <PackageVersion Include="Autofac.Owin" Version="4.2.0" />
+    <PackageVersion Include="Autofac.WebApi2" Version="4.1.0" />
+    <PackageVersion Include="Autofac" Version="4.9.1" />
+    <PackageVersion Include="Azure.Core" Version="1.40.0" />
+    <PackageVersion Include="Azure.Identity" Version="1.12.0" />
+    <PackageVersion Include="Azure.Storage.Blobs" Version="12.20.0" />
+    <PackageVersion Include="CommonMark.NET" Version="0.15.1" />
+    <PackageVersion Include="CsvHelper" Version="7.1.1" />
+    <PackageVersion Include="d3" Version="5.4.0" />
+    <PackageVersion Include="EntityFramework" Version="6.4.4" />
+    <PackageVersion Include="FluentLinkChecker" Version="1.0.0.10" />
+    <PackageVersion Include="Knapcode.MiniZip" Version="0.20.0" />
+    <PackageVersion Include="Lucene.Net.Contrib" Version="3.0.3" />
+    <PackageVersion Include="Lucene.Net" Version="3.0.3" />
+    <PackageVersion Include="MicroBuild.Core" Version="0.3.0" />
+    <PackageVersion Include="Microsoft.ApplicationInsights.TraceListener" Version="2.21.0" />
+    <PackageVersion Include="Microsoft.ApplicationInsights.Web" Version="2.21.0" />
+    <PackageVersion Include="Microsoft.ApplicationInsights" Version="2.21.0" />
+    <PackageVersion Include="Microsoft.AspNet.DynamicData.EFProvider" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.AspNet.Identity.Core" Version="1.0.0" />
+    <PackageVersion Include="Microsoft.AspNet.Mvc" Version="5.2.3" />
+    <PackageVersion Include="Microsoft.AspNet.Razor" Version="3.2.9" />
+    <PackageVersion Include="Microsoft.AspNet.Web.Optimization" Version="1.1.3" />
+    <PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="5.2.3" />
+    <PackageVersion Include="Microsoft.AspNet.WebApi.Core" Version="5.2.3" />
+    <PackageVersion Include="Microsoft.AspNet.WebApi.MessageHandlers.Compression.StrongName" Version="1.3.0" />
+    <PackageVersion Include="Microsoft.AspNet.WebApi.OData" Version="5.7.0" />
+    <PackageVersion Include="Microsoft.AspNet.WebApi.WebHost" Version="5.2.3" />
+    <PackageVersion Include="Microsoft.AspNet.WebHelpers" Version="3.2.3" />
+    <PackageVersion Include="Microsoft.AspNet.WebPages.Data" Version="3.2.3" />
+    <PackageVersion Include="Microsoft.AspNet.WebPages.WebData" Version="3.2.3" />
+    <PackageVersion Include="Microsoft.AspNet.WebPages" Version="3.2.3" />
+    <PackageVersion Include="Microsoft.AspNetCore.Cryptography.Internal" Version="1.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="1.0.0" />
+    <PackageVersion Include="Microsoft.Bcl.Compression" Version="3.9.85" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Data.Services.Client" Version="5.8.4" />
+    <PackageVersion Include="Microsoft.Data.Services" Version="5.8.4" />
+    <PackageVersion Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="2.2.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="2.2.0" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="2.2.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="2.2.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.3.1" />
+    <PackageVersion Include="Microsoft.Net.Http" Version="2.2.29" />
+    <PackageVersion Include="Microsoft.Owin.Host.SystemWeb" Version="4.2.2" />
+    <PackageVersion Include="Microsoft.Owin.Security.Cookies" Version="4.2.2" />
+    <PackageVersion Include="Microsoft.Owin.Security.MicrosoftAccount" Version="4.2.2" />
+    <PackageVersion Include="Microsoft.Owin.Security.OpenIdConnect" Version="4.2.2" />
+    <PackageVersion Include="Microsoft.Owin.Security" Version="4.2.2" />
+    <PackageVersion Include="Microsoft.Owin" Version="4.2.2" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Web.Infrastructure" Version="1.0.0" />
+    <PackageVersion Include="Microsoft.Web.Xdt" Version="3.1.0" />
+    <PackageVersion Include="Microsoft.WindowsAzure.ConfigurationManager" Version="3.2.3" />
+    <PackageVersion Include="Modernizr" Version="2.8.3" />
+    <PackageVersion Include="Moment.js" Version="2.29.4" />
+    <PackageVersion Include="Moq" Version="4.20.70" />
+    <PackageVersion Include="MvcTreeView" Version="1.4.0" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="NuGet.Build.Tasks.Pack" Version="$(NuGetClientPackageVersion)" />
+    <PackageVersion Include="NuGet.Core" Version="2.8.6" />
+    <PackageVersion Include="NuGet.Frameworks" Version="$(NuGetClientPackageVersion)" />
+    <PackageVersion Include="NuGet.Jobs.Common" Version="$(NuGetJobsPackageVersion)" />
+    <PackageVersion Include="NuGet.Packaging" Version="$(NuGetClientPackageVersion)" />
+    <PackageVersion Include="NuGet.Protocol" Version="$(NuGetClientPackageVersion)" />
+    <PackageVersion Include="NuGet.Services.Configuration" Version="$(ServerCommonPackageVersion)" />
+    <PackageVersion Include="NuGet.Services.Cursor" Version="$(ServerCommonPackageVersion)" />
+    <PackageVersion Include="NuGet.Services.FeatureFlags" Version="$(ServerCommonPackageVersion)" />
+    <PackageVersion Include="NuGet.Services.Licenses" Version="$(ServerCommonPackageVersion)" />
+    <PackageVersion Include="NuGet.Services.Logging" Version="$(ServerCommonPackageVersion)" />
+    <PackageVersion Include="NuGet.Services.Messaging.Email" Version="$(ServerCommonPackageVersion)" />
+    <PackageVersion Include="NuGet.Services.Owin" Version="$(ServerCommonPackageVersion)" />
+    <PackageVersion Include="NuGet.Services.Sql" Version="$(ServerCommonPackageVersion)" />
+    <PackageVersion Include="NuGet.Services.Validation.Common.Job" Version="$(NuGetJobsPackageVersion)" />
+    <PackageVersion Include="NuGet.Services.Validation.Issues" Version="$(ServerCommonPackageVersion)" />
+    <PackageVersion Include="NuGet.Services.Validation" Version="$(ServerCommonPackageVersion)" />
+    <PackageVersion Include="NuGet.StrongName.AnglicanGeek.MarkdownMailer" Version="1.2.0" />
+    <PackageVersion Include="NuGet.StrongName.DynamicData.EFCodeFirstProvider" Version="0.3.0" />
+    <PackageVersion Include="NuGet.StrongName.elmah.sqlserver" Version="1.2.2" />
+    <PackageVersion Include="NuGet.StrongName.elmah" Version="1.2.2" />
+    <PackageVersion Include="NuGet.StrongName.QueryInterceptor" Version="0.1.4237.2400" />
+    <PackageVersion Include="NuGet.StrongName.WebActivator" Version="1.4.4" />
+    <PackageVersion Include="NuGet.StrongName.WebBackgrounder.EntityFramework" Version="0.1.0" />
+    <PackageVersion Include="NuGet.StrongName.WebBackgrounder" Version="0.2.0" />
+    <PackageVersion Include="NuGet.Versioning" Version="$(NuGetClientPackageVersion)" />
+    <PackageVersion Include="Owin" Version="1.0.0" />
+    <PackageVersion Include="RouteMagic" Version="1.1.3" />
+    <PackageVersion Include="SharpZipLib" Version="1.3.3" />
+    <PackageVersion Include="Strathweb.CacheOutput.WebApi2.StrongName" Version="0.9.0" />
+    <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
+    <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
+    <PackageVersion Include="System.Diagnostics.Debug" Version="4.3.0" />
+    <PackageVersion Include="System.Linq.Expressions" Version="4.3.0" />
+    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
+    <PackageVersion Include="System.Runtime" Version="4.3.1" />
+    <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
+    <PackageVersion Include="WebActivatorEx" Version="2.0.6" />
+    <PackageVersion Include="WebGrease" Version="1.6.0" />
+    <PackageVersion Include="WindowsAzure.Caching" Version="1.7.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
+    <PackageVersion Include="xunit" Version="2.9.0" />
+  </ItemGroup>
+</Project>

NuGet.config

@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <config>
-    <add key="repositorypath" value=".\packages" />
-  </config>
-  <packageRestore>
-    <add key="enabled" value="True" />
-    <add key="automatic" value="True" />
-  </packageRestore>
   <packageSources>
     <clear />
-    <add key="nuget" value="https://api.nuget.org/v3/index.json" />
+    <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
     <add key="nuget-build" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
   </packageSources>
+  <disabledPackageSources>
+    <clear />
+  </disabledPackageSources>
   <packageSourceMapping>
     <clear />
-    <packageSource key="nuget">
+    <packageSource key="NuGet.org">
       <package pattern="Antlr" />
       <package pattern="Autofac" />
       <package pattern="Autofac.*" />
@@ -69,7 +65,4 @@
       <package pattern="Microsoft.Internal.*" />
     </packageSource>
   </packageSourceMapping>
-  <disabledPackageSources>
-    <clear />
-  </disabledPackageSources>
 </configuration>

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
 

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.
   -->
-  <PropertyGroup>
-    <Authors>.NET Foundation</Authors>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/NuGet/NuGetGallery</PackageProjectUrl>
-    <Copyright>© .NET Foundation. All rights reserved.</Copyright>
-    <Company>.NET Foundation</Company>
-
-    <NeutralLanguage>en-US</NeutralLanguage>
-
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <IncludeSymbols Condition="'$(IncludeSymbols)' == ''">true</IncludeSymbols>
-    <SymbolPackageFormat Condition="'$(SymbolPackageFormat)' == ''">snupkg</SymbolPackageFormat>
-
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="MicroBuild.Core">
-      <Version>0.3.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+    <PackageReference Include="Microsoft.SourceLink.GitHub">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>