Skip to content

Commit 8fff556

Browse files
loic-sharmaloic-sharma
authored
Merge pull request #7163 from NuGet/jver-merge
Merge branch 'dev' into master
2 parents 9501b35 + 60e0f9c commit 8fff556

123 files changed

Lines changed: 2949 additions & 2107 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎NuGetGallery.sln‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27323.2
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.28516.95
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{96E4AFF8-D3A1-4102-ADCF-05F186F916A9}"
77
ProjectSection(SolutionItems) = preProject
@@ -22,8 +22,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2. Tests", "2. Tests", "{39
2222
EndProject
2323
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0. Shared", "0. Shared", "{155100FF-524B-4CAF-93C6-A57478B3DBAD}"
2424
EndProject
25-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Services.Search.Client", "src\NuGet.Services.Search.Client\NuGet.Services.Search.Client.csproj", "{6931C2EE-E081-4518-9798-D34D83B35BF6}"
26-
EndProject
2725
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4. Tools", "4. Tools", "{2204C510-A559-4ED7-9590-FDC09093575B}"
2826
EndProject
2927
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GalleryTools", "src\GalleryTools\GalleryTools.csproj", "{C5849063-8CDC-4561-BA5C-7D97BD905DC3}"
@@ -32,6 +30,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Services.Entities", "
3230
EndProject
3331
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}"
3432
EndProject
33+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatabaseMigrationTools", "src\DatabaseMigrationTools\DatabaseMigrationTools.csproj", "{DCED7162-A24C-4579-96C8-544BFAF4C305}"
34+
EndProject
35+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Services.DatabaseMigration", "src\NuGet.Services.DatabaseMigration\NuGet.Services.DatabaseMigration.csproj", "{F4C8C34F-72A9-4773-A315-8FA3F2D5CE4E}"
36+
EndProject
37+
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}"
38+
EndProject
3539
Global
3640
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3741
Debug|Any CPU = Debug|Any CPU
@@ -54,10 +58,6 @@ Global
5458
{8AC9E39E-366C-47E5-80AE-38E71CD31386}.Debug|Any CPU.Build.0 = Debug|Any CPU
5559
{8AC9E39E-366C-47E5-80AE-38E71CD31386}.Release|Any CPU.ActiveCfg = Release|Any CPU
5660
{8AC9E39E-366C-47E5-80AE-38E71CD31386}.Release|Any CPU.Build.0 = Release|Any CPU
57-
{6931C2EE-E081-4518-9798-D34D83B35BF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58-
{6931C2EE-E081-4518-9798-D34D83B35BF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
59-
{6931C2EE-E081-4518-9798-D34D83B35BF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
60-
{6931C2EE-E081-4518-9798-D34D83B35BF6}.Release|Any CPU.Build.0 = Release|Any CPU
6161
{C5849063-8CDC-4561-BA5C-7D97BD905DC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6262
{C5849063-8CDC-4561-BA5C-7D97BD905DC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
6363
{C5849063-8CDC-4561-BA5C-7D97BD905DC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -70,6 +70,18 @@ Global
7070
{79C831E9-7C88-4B98-B084-4DE940C73FC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
7171
{79C831E9-7C88-4B98-B084-4DE940C73FC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
7272
{79C831E9-7C88-4B98-B084-4DE940C73FC7}.Release|Any CPU.Build.0 = Release|Any CPU
73+
{DCED7162-A24C-4579-96C8-544BFAF4C305}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74+
{DCED7162-A24C-4579-96C8-544BFAF4C305}.Debug|Any CPU.Build.0 = Debug|Any CPU
75+
{DCED7162-A24C-4579-96C8-544BFAF4C305}.Release|Any CPU.ActiveCfg = Release|Any CPU
76+
{DCED7162-A24C-4579-96C8-544BFAF4C305}.Release|Any CPU.Build.0 = Release|Any CPU
77+
{F4C8C34F-72A9-4773-A315-8FA3F2D5CE4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78+
{F4C8C34F-72A9-4773-A315-8FA3F2D5CE4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
79+
{F4C8C34F-72A9-4773-A315-8FA3F2D5CE4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
80+
{F4C8C34F-72A9-4773-A315-8FA3F2D5CE4E}.Release|Any CPU.Build.0 = Release|Any CPU
81+
{082357A1-682E-4CCC-8FCD-FA250204CDB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
82+
{082357A1-682E-4CCC-8FCD-FA250204CDB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
83+
{082357A1-682E-4CCC-8FCD-FA250204CDB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
84+
{082357A1-682E-4CCC-8FCD-FA250204CDB6}.Release|Any CPU.Build.0 = Release|Any CPU
7385
EndGlobalSection
7486
GlobalSection(SolutionProperties) = preSolution
7587
HideSolutionNode = FALSE
@@ -79,10 +91,12 @@ Global
7991
{FDC76BEF-3360-45AC-A13E-AE8F14D343D5} = {39E54EC3-CBAA-453A-BE64-748FE1559A58}
8092
{097B2CDD-9623-4C34-93C2-D373D51F5B4E} = {155100FF-524B-4CAF-93C6-A57478B3DBAD}
8193
{8AC9E39E-366C-47E5-80AE-38E71CD31386} = {39E54EC3-CBAA-453A-BE64-748FE1559A58}
82-
{6931C2EE-E081-4518-9798-D34D83B35BF6} = {05998089-58F5-4A84-8C11-C5C6244A6F89}
8394
{C5849063-8CDC-4561-BA5C-7D97BD905DC3} = {2204C510-A559-4ED7-9590-FDC09093575B}
8495
{6262F4FC-29BE-4226-B676-DB391C89D396} = {155100FF-524B-4CAF-93C6-A57478B3DBAD}
8596
{79C831E9-7C88-4B98-B084-4DE940C73FC7} = {39E54EC3-CBAA-453A-BE64-748FE1559A58}
97+
{DCED7162-A24C-4579-96C8-544BFAF4C305} = {2204C510-A559-4ED7-9590-FDC09093575B}
98+
{F4C8C34F-72A9-4773-A315-8FA3F2D5CE4E} = {155100FF-524B-4CAF-93C6-A57478B3DBAD}
99+
{082357A1-682E-4CCC-8FCD-FA250204CDB6} = {39E54EC3-CBAA-453A-BE64-748FE1559A58}
86100
EndGlobalSection
87101
GlobalSection(ExtensibilityGlobals) = postSolution
88102
SolutionGuid = {064A3BDE-5203-4AD6-A6C9-5CF08301EC8F}

‎build.ps1‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ Invoke-BuildStep 'Set version metadata in AssemblyInfo.cs' {
7979
$Paths = `
8080
(Join-Path $PSScriptRoot "src\NuGetGallery\Properties\AssemblyInfo.g.cs"), `
8181
(Join-Path $PSScriptRoot "src\NuGetGallery.Core\Properties\AssemblyInfo.g.cs"), `
82-
(Join-Path $PSScriptRoot "src\NuGet.Services.Entities\Properties\AssemblyInfo.g.cs")
82+
(Join-Path $PSScriptRoot "src\NuGet.Services.Entities\Properties\AssemblyInfo.g.cs"), `
83+
(Join-Path $PSScriptRoot "src\NuGet.Services.DatabaseMigration\Properties\AssemblyInfo.g.cs"), `
84+
(Join-Path $PSScriptRoot "src\DatabaseMigrationTools\Properties\AssemblyInfo.g.cs")
8385

8486
Foreach ($Path in $Paths) {
8587
Set-VersionInfo -Path $Path -Version $SimpleVersion -Branch $Branch -Commit $CommitSHA
@@ -92,10 +94,14 @@ Invoke-BuildStep 'Building solution' {
9294
Build-Solution $Configuration $BuildNumber -MSBuildVersion "15" $SolutionPath -SkipRestore:$SkipRestore -MSBuildProperties "/p:MvcBuildViews=true" `
9395
} `
9496
-ev +BuildErrors
95-
97+
9698
Invoke-BuildStep 'Creating artifacts' { `
9799
New-ProjectPackage (Join-Path $PSScriptRoot "src\NuGetGallery.Core\NuGetGallery.Core.csproj") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion -PackageId "NuGetGallery.Core$PackageSuffix"
98100
New-ProjectPackage (Join-Path $PSScriptRoot "src\NuGet.Services.Entities\NuGet.Services.Entities.csproj") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion
101+
New-ProjectPackage (Join-Path $PSScriptRoot "src\NuGet.Services.DatabaseMigration\NuGet.Services.DatabaseMigration.csproj") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion
102+
New-Package (Join-Path $PSScriptRoot "src\DatabaseMigrationTools\DatabaseMigration.Gallery.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -MSBuildVersion "15"
103+
New-Package (Join-Path $PSScriptRoot "src\DatabaseMigrationTools\DatabaseMigration.SupportRequest.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -MSBuildVersion "15"
104+
New-Package (Join-Path $PSScriptRoot "src\DatabaseMigrationTools\DatabaseMigration.Validation.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -MSBuildVersion "15"
99105
} `
100106
-ev +BuildErrors
101107

‎sign.thirdparty.targets‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<SignFilesDependsOn Include="EnumerateThirdPartyBinariesToSign" />
5+
</ItemGroup>
6+
<Target Name="EnumerateThirdPartyBinariesToSign" AfterTargets="AfterBuild" Condition="'$(SignType)' != 'none'">
7+
<ItemGroup>
8+
<ThirdPartyBinaries Include="AnglicanGeek.MarkdownMailer.dll" />
9+
<ThirdPartyBinaries Include="Autofac.dll" />
10+
<ThirdPartyBinaries Include="Autofac.Extensions.DependencyInjection.dll" />
11+
<ThirdPartyBinaries Include="Autofac.Integration.Mvc.dll" />
12+
<ThirdPartyBinaries Include="Autofac.Integration.Mvc.Owin.dll" />
13+
<ThirdPartyBinaries Include="Autofac.Integration.Owin.dll" />
14+
<ThirdPartyBinaries Include="Autofac.Integration.WebApi.dll" />
15+
<ThirdPartyBinaries Include="CommonMark.dll" />
16+
<ThirdPartyBinaries Include="Dapper.StrongName.dll" />
17+
<ThirdPartyBinaries Include="DynamicData.EFCodeFirstProvider.dll" />
18+
<ThirdPartyBinaries Include="Elmah.dll" />
19+
<ThirdPartyBinaries Include="ICSharpCode.SharpZipLib.dll" />
20+
<ThirdPartyBinaries Include="Lucene.Net.Contrib.Analyzers.dll" />
21+
<ThirdPartyBinaries Include="Lucene.Net.Contrib.Core.dll" />
22+
<ThirdPartyBinaries Include="Lucene.Net.Contrib.FastVectorHighlighter.dll" />
23+
<ThirdPartyBinaries Include="Lucene.Net.Contrib.Highlighter.dll" />
24+
<ThirdPartyBinaries Include="Lucene.Net.Contrib.Memory.dll" />
25+
<ThirdPartyBinaries Include="Lucene.Net.Contrib.Queries.dll" />
26+
<ThirdPartyBinaries Include="Lucene.Net.Contrib.Regex.dll" />
27+
<ThirdPartyBinaries Include="Lucene.Net.Contrib.SimpleFacetedSearch.dll" />
28+
<ThirdPartyBinaries Include="Lucene.Net.Contrib.Snowball.dll" />
29+
<ThirdPartyBinaries Include="Lucene.Net.Contrib.SpellChecker.dll" />
30+
<ThirdPartyBinaries Include="Lucene.Net.dll" />
31+
<ThirdPartyBinaries Include="Markdig.dll" />
32+
<ThirdPartyBinaries Include="MarkdownSharp.dll" />
33+
<ThirdPartyBinaries Include="Microsoft.ApplicationServer.Caching.Client.dll" />
34+
<ThirdPartyBinaries Include="Microsoft.ApplicationServer.Caching.Core.dll" />
35+
<ThirdPartyBinaries Include="Microsoft.AspNet.WebApi.MessageHandlers.Compression.dll" />
36+
<ThirdPartyBinaries Include="Microsoft.CookieCompliance.dll" />
37+
<ThirdPartyBinaries Include="Microsoft.CookieCompliance.NetStd.dll" />
38+
<ThirdPartyBinaries Include="Newtonsoft.Json.dll" />
39+
<ThirdPartyBinaries Include="Polly.dll" />
40+
<ThirdPartyBinaries Include="Polly.Extensions.Http.dll" />
41+
<ThirdPartyBinaries Include="QueryInterceptor.dll" />
42+
<ThirdPartyBinaries Include="RouteMagic.dll" />
43+
<ThirdPartyBinaries Include="Serilog.dll" />
44+
<ThirdPartyBinaries Include="Serilog.Enrichers.Environment.dll" />
45+
<ThirdPartyBinaries Include="Serilog.Enrichers.Process.dll" />
46+
<ThirdPartyBinaries Include="Serilog.Extensions.Logging.dll" />
47+
<ThirdPartyBinaries Include="Serilog.Sinks.ApplicationInsights.dll" />
48+
<ThirdPartyBinaries Include="Serilog.Sinks.ColoredConsole.dll" />
49+
<ThirdPartyBinaries Include="SerilogTraceListener.dll" />
50+
<ThirdPartyBinaries Include="WebActivator.dll" />
51+
<ThirdPartyBinaries Include="WebActivatorEx.dll" />
52+
<ThirdPartyBinaries Include="WebApi.OutputCache.Core.dll" />
53+
<ThirdPartyBinaries Include="WebApi.OutputCache.V2.dll" />
54+
<ThirdPartyBinaries Include="WebBackgrounder.dll" />
55+
<ThirdPartyBinaries Include="WebBackgrounder.EntityFramework.dll" />
56+
</ItemGroup>
57+
<ItemGroup>
58+
<FilesToSign Include="$(OutDir)%(ThirdPartyBinaries.Identity)" Condition="Exists('$(OutDir)%(ThirdPartyBinaries.Identity)')">
59+
<Authenticode>3PartySHA2</Authenticode>
60+
</FilesToSign>
61+
</ItemGroup>
62+
<Message Text="Files to sign:%0A@(FilesToSign, '%0A')" Importance="High" />
63+
</Target>
64+
</Project>

‎src/Bootstrap/dist/css/bootstrap-theme.css‎

Lines changed: 11 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Bootstrap/less/theme/page-display-package.less‎

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
position: unset;
3838
top: unset;
3939
}
40-
40+
4141
.deprecation-expander-info-right {
4242
padding-left: 15px;
4343
}
@@ -89,6 +89,7 @@
8989
li {
9090
margin-bottom: 15px;
9191
}
92+
9293
img.icon {
9394
position: absolute;
9495
left: -24px;
@@ -150,39 +151,43 @@
150151
}
151152

152153
.tab-content {
153-
height: 79px;
154-
155154
.tab-pane {
156155
> div {
157156
display: table;
158157
height: 1px;
159158
}
160159

161-
.install-script {
162-
display: table-cell;
163-
background-color: @panel-footer-bg;
164-
font-family: @font-family-monospace;
165-
color: #fff;
166-
padding: 0 10px 8px 10px;
167-
width: 100%;
168-
max-width: 1px;
169-
line-height: 1.5;
170-
// Add a border with the same color as the background to support visual callout
171-
// in high contrast mode (since borders are shown).
172-
border-color: @panel-footer-bg;
173-
border-style: solid;
174-
border-width: 1px 0 1px 1px;
175-
user-select: all;
176-
}
177-
178-
.copy-button {
179-
display: table-cell;
160+
.install-script-row {
161+
display: table-row;
162+
height: 100%;
163+
164+
.install-script {
165+
display: table-cell;
166+
background-color: @panel-footer-bg;
167+
font-family: @font-family-monospace;
168+
font-size: 1em;
169+
color: #fff;
170+
width: 100%;
171+
max-width: 1px;
172+
line-height: 1.5;
173+
white-space: pre-wrap;
174+
// Add a border with the same color as the background to support visual callout
175+
// in high contrast mode (since borders are shown).
176+
border-color: @panel-footer-bg;
177+
border-style: solid;
178+
border-width: 1px 0 1px 1px;
179+
user-select: all;
180+
vertical-align: middle;
181+
}
180182

181-
button {
183+
.copy-button {
182184
height: 100%;
183-
vertical-align: baseline;
184-
min-height: 42px;
185-
line-height: 1.5;
185+
186+
button {
187+
height: 100%;
188+
min-height: 42px;
189+
line-height: 1.5;
190+
}
186191
}
187192
}
188193

‎src/DatabaseMigrationTools/App.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
5+
</startup>
6+
</configuration>

‎src/DatabaseMigrationTools/DatabaseMigration.Gallery.nuspec‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0"?>
2+
<package >
3+
<metadata>
4+
<id>DatabaseMigration.Gallery</id>
5+
<version>$version$</version>
6+
<title>DatabaseMigration.Gallery</title>
7+
<authors>.NET Foundation</authors>
8+
<owners>.NET Foundation</owners>
9+
<description>DatabaseMigration.Gallery</description>
10+
<copyright>Copyright .NET Foundation</copyright>
11+
</metadata>
12+
<files>
13+
<file src="bin\$configuration$\*.*" target="bin"/>
14+
<file src="Scripts\PostDeploy.ps1" />
15+
</files>
16+
</package>

‎src/DatabaseMigrationTools/DatabaseMigration.SupportRequest.nuspec‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0"?>
2+
<package >
3+
<metadata>
4+
<id>DatabaseMigration.SupportRequest</id>
5+
<version>$version$</version>
6+
<title>DatabaseMigration.SupportRequest</title>
7+
<authors>.NET Foundation</authors>
8+
<owners>.NET Foundation</owners>
9+
<description>DatabaseMigration.SupportRequest</description>
10+
<copyright>Copyright .NET Foundation</copyright>
11+
</metadata>
12+
<files>
13+
<file src="bin\$configuration$\*.*" target="bin"/>
14+
<file src="Scripts\PostDeploy.ps1" />
15+
</files>
16+
</package>

‎src/DatabaseMigrationTools/DatabaseMigration.Validation.nuspec‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0"?>
2+
<package >
3+
<metadata>
4+
<id>DatabaseMigration.Validation</id>
5+
<version>$version$</version>
6+
<title>DatabaseMigration.Validation</title>
7+
<authors>.NET Foundation</authors>
8+
<owners>.NET Foundation</owners>
9+
<description>DatabaseMigration.Validation</description>
10+
<copyright>Copyright .NET Foundation</copyright>
11+
</metadata>
12+
<files>
13+
<file src="bin\$configuration$\*.*" target="bin"/>
14+
<file src="Scripts\PostDeploy.ps1" />
15+
</files>
16+
</package>

0 commit comments

Comments
 (0)