Skip to content

Commit 666ab64

Browse files
joelverhagenjoelverhagen
authored
Move gallery projects (except web) to SDK-based .csproj (#10089)
1 parent d0b5fa9 commit 666ab64

35 files changed

Lines changed: 67 additions & 1005 deletions

‎Directory.Packages.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
<PackageVersion Include="Moq" Version="4.20.70" />
7474
<PackageVersion Include="MvcTreeView" Version="1.4.0" />
7575
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
76-
<PackageVersion Include="NuGet.Build.Tasks.Pack" Version="$(NuGetClientPackageVersion)" />
7776
<PackageVersion Include="NuGet.Core" Version="2.8.6" />
7877
<PackageVersion Include="NuGet.Frameworks" Version="$(NuGetClientPackageVersion)" />
7978
<PackageVersion Include="NuGet.Jobs.Common" Version="$(NuGetJobsPackageVersion)" />

‎NuGetGallery.sln‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.8.34118.359
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{96E4AFF8-D3A1-4102-ADCF-05F186F916A9}"
7-
ProjectSection(SolutionItems) = preProject
8-
.nuget\packages.config = .nuget\packages.config
9-
EndProjectSection
10-
EndProject
116
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1. Frontend", "1. Frontend", "{05998089-58F5-4A84-8C11-C5C6244A6F89}"
127
EndProject
138
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetGallery", "src\NuGetGallery\NuGetGallery.csproj", "{1DACF781-5CD0-4123-8BAC-CD385D864BE5}"
149
EndProject
15-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetGallery.Facts", "tests\NuGetGallery.Facts\NuGetGallery.Facts.csproj", "{FDC76BEF-3360-45AC-A13E-AE8F14D343D5}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetGallery.Facts", "tests\NuGetGallery.Facts\NuGetGallery.Facts.csproj", "{FDC76BEF-3360-45AC-A13E-AE8F14D343D5}"
1611
EndProject
1712
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetGallery.Core", "src\NuGetGallery.Core\NuGetGallery.Core.csproj", "{097B2CDD-9623-4C34-93C2-D373D51F5B4E}"
1813
EndProject
19-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetGallery.Core.Facts", "tests\NuGetGallery.Core.Facts\NuGetGallery.Core.Facts.csproj", "{8AC9E39E-366C-47E5-80AE-38E71CD31386}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetGallery.Core.Facts", "tests\NuGetGallery.Core.Facts\NuGetGallery.Core.Facts.csproj", "{8AC9E39E-366C-47E5-80AE-38E71CD31386}"
2015
EndProject
2116
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2. Tests", "2. Tests", "{39E54EC3-CBAA-453A-BE64-748FE1559A58}"
2217
EndProject
@@ -28,27 +23,27 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GalleryTools", "src\Gallery
2823
EndProject
2924
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.Services.Entities", "src\NuGet.Services.Entities\NuGet.Services.Entities.csproj", "{6262F4FC-29BE-4226-B676-DB391C89D396}"
3025
EndProject
31-
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}"
26+
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}"
3227
EndProject
3328
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VerifyMicrosoftPackage", "src\VerifyMicrosoftPackage\VerifyMicrosoftPackage.csproj", "{C57292F4-9661-4AEB-AD89-C82CF1152260}"
3429
EndProject
35-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VerifyMicrosoftPackage.Facts", "tests\VerifyMicrosoftPackage.Facts\VerifyMicrosoftPackage.Facts.csproj", "{FFF38843-B8E1-40E7-95E4-E3346599E8D5}"
30+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VerifyMicrosoftPackage.Facts", "tests\VerifyMicrosoftPackage.Facts\VerifyMicrosoftPackage.Facts.csproj", "{FFF38843-B8E1-40E7-95E4-E3346599E8D5}"
3631
EndProject
37-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatabaseMigrationTools", "src\DatabaseMigrationTools\DatabaseMigrationTools.csproj", "{DCED7162-A24C-4579-96C8-544BFAF4C305}"
32+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DatabaseMigrationTools", "src\DatabaseMigrationTools\DatabaseMigrationTools.csproj", "{DCED7162-A24C-4579-96C8-544BFAF4C305}"
3833
EndProject
39-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Services.DatabaseMigration", "src\NuGet.Services.DatabaseMigration\NuGet.Services.DatabaseMigration.csproj", "{F4C8C34F-72A9-4773-A315-8FA3F2D5CE4E}"
34+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.Services.DatabaseMigration", "src\NuGet.Services.DatabaseMigration\NuGet.Services.DatabaseMigration.csproj", "{F4C8C34F-72A9-4773-A315-8FA3F2D5CE4E}"
4035
EndProject
41-
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}"
36+
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}"
4237
EndProject
4338
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetGallery.Services", "src\NuGetGallery.Services\NuGetGallery.Services.csproj", "{C7D5E850-33FA-4EC5-8D7F-B1C8DD5D48F9}"
4439
EndProject
45-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AccountDeleter", "src\AccountDeleter\AccountDeleter.csproj", "{8EE102B9-DA4E-4FDF-B6FD-FB12E6584DD7}"
40+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AccountDeleter", "src\AccountDeleter\AccountDeleter.csproj", "{8EE102B9-DA4E-4FDF-B6FD-FB12E6584DD7}"
4641
EndProject
47-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AccountDeleter.Facts", "tests\AccountDeleter.Facts\AccountDeleter.Facts.csproj", "{98765110-844D-41BE-8083-22E064136E05}"
42+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AccountDeleter.Facts", "tests\AccountDeleter.Facts\AccountDeleter.Facts.csproj", "{98765110-844D-41BE-8083-22E064136E05}"
4843
EndProject
4944
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHubVulnerabilities2Db", "src\GitHubVulnerabilities2Db\GitHubVulnerabilities2Db.csproj", "{26BB718A-E1C1-4E70-9008-FB8EE7A7F7E5}"
5045
EndProject
51-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHubVulnerabilities2Db.Facts", "tests\GitHubVulnerabilities2Db.Facts\GitHubVulnerabilities2Db.Facts.csproj", "{E50953CB-209A-484E-951D-A68F5CF3C546}"
46+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHubVulnerabilities2Db.Facts", "tests\GitHubVulnerabilities2Db.Facts\GitHubVulnerabilities2Db.Facts.csproj", "{E50953CB-209A-484E-951D-A68F5CF3C546}"
5247
EndProject
5348
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VerifyGitHubVulnerabilities", "src\VerifyGitHubVulnerabilities\VerifyGitHubVulnerabilities.csproj", "{C0B764D2-D376-439E-A5C4-1AC41B11E9DE}"
5449
EndProject
@@ -65,7 +60,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.Services.GitHub", "sr
6560
EndProject
6661
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHubVulnerabilities2V3", "src\GitHubVulnerabilities2v3\GitHubVulnerabilities2V3.csproj", "{DD9073AF-838E-44E8-91FE-995586E8134A}"
6762
EndProject
68-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHubVulnerabilities2v3.Facts", "tests\GitHubVulnerabilities2v3.Facts\GitHubVulnerabilities2v3.Facts.csproj", "{46A2C2EB-B7DC-4FAB-ABE2-A2CE6118585C}"
63+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHubVulnerabilities2v3.Facts", "tests\GitHubVulnerabilities2v3.Facts\GitHubVulnerabilities2v3.Facts.csproj", "{46A2C2EB-B7DC-4FAB-ABE2-A2CE6118585C}"
6964
EndProject
7065
Global
7166
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎sign.thirdparty.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<ThirdPartyBinaries Include="Lucene.Net.dll" />
2929
<ThirdPartyBinaries Include="Markdig.Signed.dll" />
3030
<ThirdPartyBinaries Include="MarkdownSharp.dll" />
31+
<ThirdPartyBinaries Include="MessagePack.dll" />
3132
<ThirdPartyBinaries Include="Microsoft.ApplicationServer.Caching.Client.dll" />
3233
<ThirdPartyBinaries Include="Microsoft.ApplicationServer.Caching.Core.dll" />
3334
<ThirdPartyBinaries Include="Microsoft.AspNet.WebApi.MessageHandlers.Compression.dll" />

‎src/AccountDeleter/AccountDeleter.csproj‎

Lines changed: 4 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,129 +1,17 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<Import Project="..\..\sign.thirdparty.props" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="..\..\SdkProjects.props" />
53
<PropertyGroup>
6-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8-
<ProjectGuid>{8EE102B9-DA4E-4FDF-B6FD-FB12E6584DD7}</ProjectGuid>
4+
<TargetFramework>net472</TargetFramework>
95
<OutputType>Exe</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
116
<RootNamespace>NuGetGallery.AccountDeleter</RootNamespace>
12-
<AssemblyName>AccountDeleter</AssemblyName>
13-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
14-
<FileAlignment>512</FileAlignment>
15-
<Deterministic>true</Deterministic>
16-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
177
</PropertyGroup>
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<DebugSymbols>true</DebugSymbols>
20-
<DebugType>full</DebugType>
21-
<Optimize>false</Optimize>
22-
<OutputPath>bin\Debug\</OutputPath>
23-
<DefineConstants>DEBUG;TRACE</DefineConstants>
24-
<ErrorReport>prompt</ErrorReport>
25-
<WarningLevel>4</WarningLevel>
26-
<Prefer32Bit>false</Prefer32Bit>
27-
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<DebugType>pdbonly</DebugType>
30-
<Optimize>true</Optimize>
31-
<OutputPath>bin\Release\</OutputPath>
32-
<DefineConstants>TRACE</DefineConstants>
33-
<ErrorReport>prompt</ErrorReport>
34-
<WarningLevel>4</WarningLevel>
35-
<Prefer32Bit>false</Prefer32Bit>
36-
</PropertyGroup>
37-
<PropertyGroup>
38-
<StartupObject />
39-
</PropertyGroup>
40-
<ItemGroup>
41-
<Reference Include="System" />
42-
<Reference Include="System.Core" />
43-
<Reference Include="System.Xml.Linq" />
44-
<Reference Include="System.Data.DataSetExtensions" />
45-
<Reference Include="Microsoft.CSharp" />
46-
<Reference Include="System.Data" />
47-
<Reference Include="System.Xml" />
48-
</ItemGroup>
49-
<ItemGroup>
50-
<Compile Include="AccountDeleteMessageHandler.cs" />
51-
<Compile Include="Configuration\AccountDeleteConfiguration.cs" />
52-
<Compile Include="Configuration\CoreMessageServiceConfiguration.cs" />
53-
<Compile Include="Configuration\EmailConfiguration.cs" />
54-
<Compile Include="Configuration\GalleryConfiguration.cs" />
55-
<Compile Include="Configuration\MailTemplateConfiguration.cs" />
56-
<Compile Include="Configuration\SourceConfiguration.cs" />
57-
<Compile Include="EmptyFeatureFlagService.cs" />
58-
<Compile Include="EmptyIndexingService.cs" />
59-
<Compile Include="Evaluators\AccountConfirmedEvaluator.cs" />
60-
<Compile Include="Evaluators\AggregateEvaluator.cs" />
61-
<Compile Include="Evaluators\AlwaysAllowEvaluator.cs" />
62-
<Compile Include="Evaluators\BaseUserEvaluator.cs" />
63-
<Compile Include="Evaluators\EvaluatorKey.cs" />
64-
<Compile Include="Evaluators\NuGetDeleteEvaluator.cs" />
65-
<Compile Include="Evaluators\IUserEvaluatorFactory.cs" />
66-
<Compile Include="Evaluators\UserEvaluatorComparer.cs" />
67-
<Compile Include="Evaluators\UserEvaluatorFactory.cs" />
68-
<Compile Include="Exceptions\UnknownEvaluatorException.cs" />
69-
<Compile Include="Exceptions\UnknownSourceException.cs" />
70-
<Compile Include="Exceptions\UserNotFoundException.cs" />
71-
<Compile Include="Messaging\AccountDeleteEmailBuilder.cs" />
72-
<Compile Include="Messaging\DisposableEmailBuilder.cs" />
73-
<Compile Include="Messaging\EmailBuilderFactory.cs" />
74-
<Compile Include="EmptyDeleteAccountService.cs" />
75-
<Compile Include="Messaging\DebugMessageService.cs" />
76-
<Compile Include="EmptyUserService.cs" />
77-
<Compile Include="Evaluators\AlwaysRejectEvaluator.cs" />
78-
<Compile Include="GalleryAccountManager.cs" />
79-
<Compile Include="IAccountManager.cs" />
80-
<Compile Include="Messaging\IEmailBuilderFactory.cs" />
81-
<Compile Include="Evaluators\IUserEvaluator.cs" />
82-
<Compile Include="Job.cs" />
83-
<Compile Include="AccountDeleteUserService.cs" />
84-
<Compile Include="Program.cs" />
85-
<Compile Include="Properties\AssemblyInfo.cs" />
86-
<Compile Include="Properties\AssemblyInfo.*.cs" />
87-
<Compile Include="Providers\AccountDeleteUrlHelper.cs" />
88-
<Compile Include="Telemetry\IAccountDeleteTelemetryService.cs" />
89-
<Compile Include="Telemetry\AccountDeleteTelemetryService.cs" />
90-
</ItemGroup>
918
<ItemGroup>
92-
<ProjectReference Include="..\NuGet.Services.Entities\NuGet.Services.Entities.csproj">
93-
<Project>{6262f4fc-29be-4226-b676-db391c89d396}</Project>
94-
<Name>NuGet.Services.Entities</Name>
95-
</ProjectReference>
96-
<ProjectReference Include="..\NuGetGallery.Core\NuGetGallery.Core.csproj">
97-
<Project>{097b2cdd-9623-4c34-93c2-d373d51f5b4e}</Project>
98-
<Name>NuGetGallery.Core</Name>
99-
</ProjectReference>
100-
<ProjectReference Include="..\NuGetGallery.Services\NuGetGallery.Services.csproj">
101-
<Project>{c7d5e850-33fa-4ec5-8d7f-b1c8dd5d48f9}</Project>
102-
<Name>NuGetGallery.Services</Name>
103-
</ProjectReference>
9+
<ProjectReference Include="..\NuGetGallery.Services\NuGetGallery.Services.csproj" />
10410
</ItemGroup>
10511
<ItemGroup>
106-
<PackageReference Include="MicroBuild.Core">
107-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
108-
<PrivateAssets>all</PrivateAssets>
109-
</PackageReference>
11012
<PackageReference Include="NuGet.Services.Validation.Common.Job" />
11113
</ItemGroup>
11214
<ItemGroup>
113-
<None Include="App.config" />
114-
<None Include="Scripts\Functions.ps1" />
115-
<None Include="Scripts\PostDeploy.ps1" />
116-
<None Include="Scripts\PreDeploy.ps1" />
11715
<Content Include="Scripts\nssm.exe" />
11816
</ItemGroup>
119-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
120-
<PropertyGroup>
121-
<SignPath>..\..\build</SignPath>
122-
<SignPath Condition="'$(BUILD_SOURCESDIRECTORY)' != ''">$(BUILD_SOURCESDIRECTORY)\build</SignPath>
123-
<SignPath Condition="'$(NuGetBuildPath)' != ''">$(NuGetBuildPath)</SignPath>
124-
<SignType Condition="'$(SignType)' == ''">none</SignType>
125-
</PropertyGroup>
126-
<Import Project="$(SignPath)\sign.targets" Condition="Exists('$(SignPath)\sign.targets')" />
127-
<Import Project="$(SignPath)\sign.microbuild.targets" Condition="Exists('$(SignPath)\sign.microbuild.targets')" />
128-
<Import Project="$(NuGetBuildExtensions)" Condition="'$(NuGetBuildExtensions)' != '' And Exists('$(NuGetBuildExtensions)')" />
12917
</Project>

‎src/AccountDeleter/App.config‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/AccountDeleter/Gallery.AccountDeleter.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<copyright>Copyright Microsoft corp.</copyright>
1111
</metadata>
1212
<files>
13-
<file src="bin\$configuration$\**\*.*" target="bin"/>
13+
<file src="bin\$configuration$\net472\**\*.*" target="bin"/>
1414

1515
<file src="Scripts\Functions.ps1" />
1616
<file src="Scripts\PreDeploy.ps1" />

‎src/AccountDeleter/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎src/DatabaseMigrationTools/App.config‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/DatabaseMigrationTools/DatabaseMigration.Gallery.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<copyright>Copyright .NET Foundation</copyright>
1111
</metadata>
1212
<files>
13-
<file src="bin\$configuration$\*.*" target="bin"/>
13+
<file src="bin\$configuration$\net472\*.*" target="bin"/>
1414
<file src="Scripts\PostDeploy.ps1" />
1515
</files>
1616
</package>

‎src/DatabaseMigrationTools/DatabaseMigration.SupportRequest.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<copyright>Copyright .NET Foundation</copyright>
1111
</metadata>
1212
<files>
13-
<file src="bin\$configuration$\*.*" target="bin"/>
13+
<file src="bin\$configuration$\net472\*.*" target="bin"/>
1414
<file src="Scripts\PostDeploy.ps1" />
1515
</files>
1616
</package>

0 commit comments

Comments
 (0)