Move gallery projects (except web) to SDK-based .csproj

Directory.Packages.props

@@ -73,7 +73,6 @@
     <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)" />

NuGetGallery.sln

@@ -3,20 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.8.34118.359
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{96E4AFF8-D3A1-4102-ADCF-05F186F916A9}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\packages.config = .nuget\packages.config
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1. Frontend", "1. Frontend", "{05998089-58F5-4A84-8C11-C5C6244A6F89}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetGallery", "src\NuGetGallery\NuGetGallery.csproj", "{1DACF781-5CD0-4123-8BAC-CD385D864BE5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetGallery.Facts", "tests\NuGetGallery.Facts\NuGetGallery.Facts.csproj", "{FDC76BEF-3360-45AC-A13E-AE8F14D343D5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetGallery.Facts", "tests\NuGetGallery.Facts\NuGetGallery.Facts.csproj", "{FDC76BEF-3360-45AC-A13E-AE8F14D343D5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetGallery.Core", "src\NuGetGallery.Core\NuGetGallery.Core.csproj", "{097B2CDD-9623-4C34-93C2-D373D51F5B4E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetGallery.Core.Facts", "tests\NuGetGallery.Core.Facts\NuGetGallery.Core.Facts.csproj", "{8AC9E39E-366C-47E5-80AE-38E71CD31386}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetGallery.Core.Facts", "tests\NuGetGallery.Core.Facts\NuGetGallery.Core.Facts.csproj", "{8AC9E39E-366C-47E5-80AE-38E71CD31386}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2. Tests", "2. Tests", "{39E54EC3-CBAA-453A-BE64-748FE1559A58}"
 EndProject
@@ -28,27 +23,27 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GalleryTools", "src\Gallery
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.Services.Entities", "src\NuGet.Services.Entities\NuGet.Services.Entities.csproj", "{6262F4FC-29BE-4226-B676-DB391C89D396}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Services.Entities.Tests", "tests\NuGet.Services.Entities.Tests\NuGet.Services.Entities.Tests.csproj", "{79C831E9-7C88-4B98-B084-4DE940C73FC7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.Services.Entities.Tests", "tests\NuGet.Services.Entities.Tests\NuGet.Services.Entities.Tests.csproj", "{79C831E9-7C88-4B98-B084-4DE940C73FC7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VerifyMicrosoftPackage", "src\VerifyMicrosoftPackage\VerifyMicrosoftPackage.csproj", "{C57292F4-9661-4AEB-AD89-C82CF1152260}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VerifyMicrosoftPackage.Facts", "tests\VerifyMicrosoftPackage.Facts\VerifyMicrosoftPackage.Facts.csproj", "{FFF38843-B8E1-40E7-95E4-E3346599E8D5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VerifyMicrosoftPackage.Facts", "tests\VerifyMicrosoftPackage.Facts\VerifyMicrosoftPackage.Facts.csproj", "{FFF38843-B8E1-40E7-95E4-E3346599E8D5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatabaseMigrationTools", "src\DatabaseMigrationTools\DatabaseMigrationTools.csproj", "{DCED7162-A24C-4579-96C8-544BFAF4C305}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DatabaseMigrationTools", "src\DatabaseMigrationTools\DatabaseMigrationTools.csproj", "{DCED7162-A24C-4579-96C8-544BFAF4C305}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Services.DatabaseMigration", "src\NuGet.Services.DatabaseMigration\NuGet.Services.DatabaseMigration.csproj", "{F4C8C34F-72A9-4773-A315-8FA3F2D5CE4E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.Services.DatabaseMigration", "src\NuGet.Services.DatabaseMigration\NuGet.Services.DatabaseMigration.csproj", "{F4C8C34F-72A9-4773-A315-8FA3F2D5CE4E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Services.DatabaseMigration.Facts", "tests\NuGet.Services.DatabaseMigration.Facts\NuGet.Services.DatabaseMigration.Facts.csproj", "{082357A1-682E-4CCC-8FCD-FA250204CDB6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.Services.DatabaseMigration.Facts", "tests\NuGet.Services.DatabaseMigration.Facts\NuGet.Services.DatabaseMigration.Facts.csproj", "{082357A1-682E-4CCC-8FCD-FA250204CDB6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetGallery.Services", "src\NuGetGallery.Services\NuGetGallery.Services.csproj", "{C7D5E850-33FA-4EC5-8D7F-B1C8DD5D48F9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AccountDeleter", "src\AccountDeleter\AccountDeleter.csproj", "{8EE102B9-DA4E-4FDF-B6FD-FB12E6584DD7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AccountDeleter", "src\AccountDeleter\AccountDeleter.csproj", "{8EE102B9-DA4E-4FDF-B6FD-FB12E6584DD7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AccountDeleter.Facts", "tests\AccountDeleter.Facts\AccountDeleter.Facts.csproj", "{98765110-844D-41BE-8083-22E064136E05}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AccountDeleter.Facts", "tests\AccountDeleter.Facts\AccountDeleter.Facts.csproj", "{98765110-844D-41BE-8083-22E064136E05}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHubVulnerabilities2Db", "src\GitHubVulnerabilities2Db\GitHubVulnerabilities2Db.csproj", "{26BB718A-E1C1-4E70-9008-FB8EE7A7F7E5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHubVulnerabilities2Db.Facts", "tests\GitHubVulnerabilities2Db.Facts\GitHubVulnerabilities2Db.Facts.csproj", "{E50953CB-209A-484E-951D-A68F5CF3C546}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHubVulnerabilities2Db.Facts", "tests\GitHubVulnerabilities2Db.Facts\GitHubVulnerabilities2Db.Facts.csproj", "{E50953CB-209A-484E-951D-A68F5CF3C546}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VerifyGitHubVulnerabilities", "src\VerifyGitHubVulnerabilities\VerifyGitHubVulnerabilities.csproj", "{C0B764D2-D376-439E-A5C4-1AC41B11E9DE}"
 EndProject
@@ -65,7 +60,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.Services.GitHub", "sr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHubVulnerabilities2V3", "src\GitHubVulnerabilities2v3\GitHubVulnerabilities2V3.csproj", "{DD9073AF-838E-44E8-91FE-995586E8134A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHubVulnerabilities2v3.Facts", "tests\GitHubVulnerabilities2v3.Facts\GitHubVulnerabilities2v3.Facts.csproj", "{46A2C2EB-B7DC-4FAB-ABE2-A2CE6118585C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHubVulnerabilities2v3.Facts", "tests\GitHubVulnerabilities2v3.Facts\GitHubVulnerabilities2v3.Facts.csproj", "{46A2C2EB-B7DC-4FAB-ABE2-A2CE6118585C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

sign.thirdparty.props

@@ -28,6 +28,7 @@
     <ThirdPartyBinaries Include="Lucene.Net.dll" />
     <ThirdPartyBinaries Include="Markdig.Signed.dll" />
     <ThirdPartyBinaries Include="MarkdownSharp.dll" />
+    <ThirdPartyBinaries Include="MessagePack.dll" />
     <ThirdPartyBinaries Include="Microsoft.ApplicationServer.Caching.Client.dll" />
     <ThirdPartyBinaries Include="Microsoft.ApplicationServer.Caching.Core.dll" />
     <ThirdPartyBinaries Include="Microsoft.AspNet.WebApi.MessageHandlers.Compression.dll" />

src/AccountDeleter/AccountDeleter.csproj

@@ -1,129 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="..\..\sign.thirdparty.props" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\..\SdkProjects.props" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{8EE102B9-DA4E-4FDF-B6FD-FB12E6584DD7}</ProjectGuid>
+    <TargetFramework>net472</TargetFramework>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NuGetGallery.AccountDeleter</RootNamespace>
-    <AssemblyName>AccountDeleter</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject />
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AccountDeleteMessageHandler.cs" />
-    <Compile Include="Configuration\AccountDeleteConfiguration.cs" />
-    <Compile Include="Configuration\CoreMessageServiceConfiguration.cs" />
-    <Compile Include="Configuration\EmailConfiguration.cs" />
-    <Compile Include="Configuration\GalleryConfiguration.cs" />
-    <Compile Include="Configuration\MailTemplateConfiguration.cs" />
-    <Compile Include="Configuration\SourceConfiguration.cs" />
-    <Compile Include="EmptyFeatureFlagService.cs" />
-    <Compile Include="EmptyIndexingService.cs" />
-    <Compile Include="Evaluators\AccountConfirmedEvaluator.cs" />
-    <Compile Include="Evaluators\AggregateEvaluator.cs" />
-    <Compile Include="Evaluators\AlwaysAllowEvaluator.cs" />
-    <Compile Include="Evaluators\BaseUserEvaluator.cs" />
-    <Compile Include="Evaluators\EvaluatorKey.cs" />
-    <Compile Include="Evaluators\NuGetDeleteEvaluator.cs" />
-    <Compile Include="Evaluators\IUserEvaluatorFactory.cs" />
-    <Compile Include="Evaluators\UserEvaluatorComparer.cs" />
-    <Compile Include="Evaluators\UserEvaluatorFactory.cs" />
-    <Compile Include="Exceptions\UnknownEvaluatorException.cs" />
-    <Compile Include="Exceptions\UnknownSourceException.cs" />
-    <Compile Include="Exceptions\UserNotFoundException.cs" />
-    <Compile Include="Messaging\AccountDeleteEmailBuilder.cs" />
-    <Compile Include="Messaging\DisposableEmailBuilder.cs" />
-    <Compile Include="Messaging\EmailBuilderFactory.cs" />
-    <Compile Include="EmptyDeleteAccountService.cs" />
-    <Compile Include="Messaging\DebugMessageService.cs" />
-    <Compile Include="EmptyUserService.cs" />
-    <Compile Include="Evaluators\AlwaysRejectEvaluator.cs" />
-    <Compile Include="GalleryAccountManager.cs" />
-    <Compile Include="IAccountManager.cs" />
-    <Compile Include="Messaging\IEmailBuilderFactory.cs" />
-    <Compile Include="Evaluators\IUserEvaluator.cs" />
-    <Compile Include="Job.cs" />
-    <Compile Include="AccountDeleteUserService.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\AssemblyInfo.*.cs" />
-    <Compile Include="Providers\AccountDeleteUrlHelper.cs" />
-    <Compile Include="Telemetry\IAccountDeleteTelemetryService.cs" />
-    <Compile Include="Telemetry\AccountDeleteTelemetryService.cs" />
-  </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NuGet.Services.Entities\NuGet.Services.Entities.csproj">
-      <Project>{6262f4fc-29be-4226-b676-db391c89d396}</Project>
-      <Name>NuGet.Services.Entities</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NuGetGallery.Core\NuGetGallery.Core.csproj">
-      <Project>{097b2cdd-9623-4c34-93c2-d373d51f5b4e}</Project>
-      <Name>NuGetGallery.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NuGetGallery.Services\NuGetGallery.Services.csproj">
-      <Project>{c7d5e850-33fa-4ec5-8d7f-b1c8dd5d48f9}</Project>
-      <Name>NuGetGallery.Services</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\NuGetGallery.Services\NuGetGallery.Services.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MicroBuild.Core">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="NuGet.Services.Validation.Common.Job" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
-    <None Include="Scripts\Functions.ps1" />
-    <None Include="Scripts\PostDeploy.ps1" />
-    <None Include="Scripts\PreDeploy.ps1" />
     <Content Include="Scripts\nssm.exe" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <SignPath>..\..\build</SignPath>
-    <SignPath Condition="'$(BUILD_SOURCESDIRECTORY)' != ''">$(BUILD_SOURCESDIRECTORY)\build</SignPath>
-    <SignPath Condition="'$(NuGetBuildPath)' != ''">$(NuGetBuildPath)</SignPath>
-    <SignType Condition="'$(SignType)' == ''">none</SignType>
-  </PropertyGroup>
-  <Import Project="$(SignPath)\sign.targets" Condition="Exists('$(SignPath)\sign.targets')" />
-  <Import Project="$(SignPath)\sign.microbuild.targets" Condition="Exists('$(SignPath)\sign.microbuild.targets')" />
-  <Import Project="$(NuGetBuildExtensions)" Condition="'$(NuGetBuildExtensions)' != '' And Exists('$(NuGetBuildExtensions)')" />
 </Project>

src/AccountDeleter/Gallery.AccountDeleter.nuspec

@@ -10,7 +10,7 @@
     <copyright>Copyright Microsoft corp.</copyright>
   </metadata>
   <files>
-    <file src="bin\$configuration$\**\*.*" target="bin"/>
+    <file src="bin\$configuration$\net472\**\*.*" target="bin"/>
 
     <file src="Scripts\Functions.ps1" />
     <file src="Scripts\PreDeploy.ps1" />

src/DatabaseMigrationTools/DatabaseMigration.Gallery.nuspec

@@ -10,7 +10,7 @@
     <copyright>Copyright .NET Foundation</copyright>
   </metadata>
   <files>
-    <file src="bin\$configuration$\*.*" target="bin"/>
+    <file src="bin\$configuration$\net472\*.*" target="bin"/>
     <file src="Scripts\PostDeploy.ps1" />
   </files>
 </package>

src/DatabaseMigrationTools/DatabaseMigration.SupportRequest.nuspec

@@ -10,7 +10,7 @@
     <copyright>Copyright .NET Foundation</copyright>
   </metadata>
   <files>
-    <file src="bin\$configuration$\*.*" target="bin"/>
+    <file src="bin\$configuration$\net472\*.*" target="bin"/>
     <file src="Scripts\PostDeploy.ps1" />
   </files>
 </package>

src/DatabaseMigrationTools/DatabaseMigration.Validation.nuspec

@@ -10,7 +10,7 @@
     <copyright>Copyright .NET Foundation</copyright>
   </metadata>
   <files>
-    <file src="bin\$configuration$\*.*" target="bin"/>
+    <file src="bin\$configuration$\net472\*.*" target="bin"/>
     <file src="Scripts\PostDeploy.ps1" />
   </files>
 </package>