Skip to content

Commit 5bc92a4

Browse files
zhhyuzhhyu
authored
Merge pull request #8338 from NuGet/dev
[ReleasePrep][2020.12.01]RI of dev into master
2 parents 0a4c9a3 + 3ca24ec commit 5bc92a4

55 files changed

Lines changed: 663 additions & 1115 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: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetGallery", "src\NuGetGa
1414
EndProject
1515
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetGallery.Facts", "tests\NuGetGallery.Facts\NuGetGallery.Facts.csproj", "{FDC76BEF-3360-45AC-A13E-AE8F14D343D5}"
1616
EndProject
17-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetGallery.Core", "src\NuGetGallery.Core\NuGetGallery.Core.csproj", "{097B2CDD-9623-4C34-93C2-D373D51F5B4E}"
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetGallery.Core", "src\NuGetGallery.Core\NuGetGallery.Core.csproj", "{097B2CDD-9623-4C34-93C2-D373D51F5B4E}"
1818
EndProject
1919
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetGallery.Core.Facts", "tests\NuGetGallery.Core.Facts\NuGetGallery.Core.Facts.csproj", "{8AC9E39E-366C-47E5-80AE-38E71CD31386}"
2020
EndProject
@@ -26,7 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4. Tools", "4. Tools", "{22
2626
EndProject
2727
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GalleryTools", "src\GalleryTools\GalleryTools.csproj", "{C5849063-8CDC-4561-BA5C-7D97BD905DC3}"
2828
EndProject
29-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Services.Entities", "src\NuGet.Services.Entities\NuGet.Services.Entities.csproj", "{6262F4FC-29BE-4226-B676-DB391C89D396}"
29+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.Services.Entities", "src\NuGet.Services.Entities\NuGet.Services.Entities.csproj", "{6262F4FC-29BE-4226-B676-DB391C89D396}"
3030
EndProject
3131
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}"
3232
EndProject
@@ -55,6 +55,8 @@ EndProject
5555
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C643C106-D245-4F00-A486-146357812D8D}"
5656
ProjectSection(SolutionItems) = preProject
5757
.editorconfig = .editorconfig
58+
Directory.Build.props = Directory.Build.props
59+
SdkProjects.props = SdkProjects.props
5860
EndProjectSection
5961
EndProject
6062
Global

‎SdkProjects.props‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<Project>
2+
<!--
3+
These properties are only meant for projects using the newer SDK-based project style. Properties that are meant for
4+
all projects (both legacy .csproj and SDK-based .csproj) should be put in Directory.Build.props.
5+
-->
6+
<PropertyGroup>
7+
<Authors>.NET Foundation</Authors>
8+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
9+
<PackageProjectUrl>https://github.com/NuGet/NuGetGallery</PackageProjectUrl>
10+
<Copyright>© .NET Foundation. All rights reserved.</Copyright>
11+
<Company>.NET Foundation</Company>
12+
13+
<NeutralLanguage>en-US</NeutralLanguage>
14+
15+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
16+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
17+
<IncludeSymbols Condition="'$(IncludeSymbols)' == ''">true</IncludeSymbols>
18+
<SymbolPackageFormat Condition="'$(SymbolPackageFormat)' == ''">snupkg</SymbolPackageFormat>
19+
20+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
21+
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
22+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
23+
</PropertyGroup>
24+
25+
<ItemGroup>
26+
<PackageReference Include="MicroBuild.Core">
27+
<Version>0.3.0</Version>
28+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
29+
<PrivateAssets>all</PrivateAssets>
30+
</PackageReference>
31+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
32+
<PrivateAssets>all</PrivateAssets>
33+
</PackageReference>
34+
</ItemGroup>
35+
36+
<PropertyGroup>
37+
<SignPath>build</SignPath>
38+
<SignPath Condition="'$(BUILD_SOURCESDIRECTORY)' != ''">$(BUILD_SOURCESDIRECTORY)\build</SignPath>
39+
<SignPath Condition="'$(NuGetBuildPath)' != ''">$(NuGetBuildPath)</SignPath>
40+
<SignType Condition="'$(SignType)' == ''">none</SignType>
41+
</PropertyGroup>
42+
<Import Project="$(SignPath)\sign.targets" Condition="Exists('$(SignPath)\sign.targets')" />
43+
<Import Project="$(SignPath)\sign.microbuild.targets" Condition="Exists('$(SignPath)\sign.microbuild.targets')" />
44+
</Project>

‎build.ps1‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ param (
1010
[string]$PackageSuffix,
1111
[string]$Branch,
1212
[string]$CommitSHA,
13-
[string]$BuildBranch = '6d1fcf147a7af8b6b4db842494bc7beed3b1d0e9',
13+
[string]$BuildBranch = '948e06b7e5dc320eccd1f44a15a5faeb60384ed6',
1414
[string]$VerifyMicrosoftPackageVersion = $null
1515
)
1616

@@ -90,41 +90,44 @@ Invoke-BuildStep 'Set version metadata in AssemblyInfo.cs' {
9090
(Join-Path $PSScriptRoot "src\VerifyMicrosoftPackage\Properties\AssemblyInfo.g.cs")
9191

9292
Foreach ($Path in $Paths) {
93+
# Ensure the directory exists before generating the version info file.
94+
$directory = Split-Path $Path
95+
New-Item -ItemType Directory -Force -Path $directory | Out-Null
9396
Set-VersionInfo -Path $Path -Version $SimpleVersion -Branch $Branch -Commit $CommitSHA
9497
}
9598
} `
9699
-ev +BuildErrors
97100

98101
Invoke-BuildStep 'Building solution' {
99102
$SolutionPath = Join-Path $PSScriptRoot "NuGetGallery.sln"
100-
Build-Solution $Configuration $BuildNumber -MSBuildVersion "15" $SolutionPath -SkipRestore:$SkipRestore -MSBuildProperties "/p:MvcBuildViews=true" `
103+
Build-Solution -Configuration $Configuration -BuildNumber $BuildNumber -SolutionPath $SolutionPath -SkipRestore:$SkipRestore -MSBuildProperties "/p:MvcBuildViews=true" `
101104
} `
102105
-ev +BuildErrors
103106

104107
Invoke-BuildStep 'Signing the binaries' {
105-
Sign-Binaries -Configuration $Configuration -BuildNumber $BuildNumber -MSBuildVersion "15" `
108+
Sign-Binaries -Configuration $Configuration -BuildNumber $BuildNumber `
106109
} `
107110
-ev +BuildErrors
108111

109112
Invoke-BuildStep 'Creating artifacts' { `
110113
New-ProjectPackage (Join-Path $PSScriptRoot "src\NuGetGallery.Core\NuGetGallery.Core.csproj") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion -PackageId "NuGetGallery.Core$PackageSuffix"
111114
New-ProjectPackage (Join-Path $PSScriptRoot "src\NuGet.Services.Entities\NuGet.Services.Entities.csproj") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion
112115
New-ProjectPackage (Join-Path $PSScriptRoot "src\NuGet.Services.DatabaseMigration\NuGet.Services.DatabaseMigration.csproj") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion
113-
New-Package (Join-Path $PSScriptRoot "src\DatabaseMigrationTools\DatabaseMigration.Gallery.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -MSBuildVersion "15"
114-
New-Package (Join-Path $PSScriptRoot "src\DatabaseMigrationTools\DatabaseMigration.SupportRequest.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -MSBuildVersion "15"
115-
New-Package (Join-Path $PSScriptRoot "src\DatabaseMigrationTools\DatabaseMigration.Validation.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -MSBuildVersion "15"
116-
New-Package (Join-Path $PSScriptRoot "src\AccountDeleter\Gallery.AccountDeleter.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -MSBuildVersion "15"
117-
New-Package (Join-Path $PSScriptRoot "src\GitHubVulnerabilities2Db\GitHubVulnerabilities2Db.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -MSBuildVersion "15"
118-
New-Package (Join-Path $PSScriptRoot "src\GalleryTools\Gallery.GalleryTools.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -MSBuildVersion "15"
119-
New-Package (Join-Path $PSScriptRoot "src\VerifyGitHubVulnerabilities\VerifyGitHubVulnerabilities.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -MSBuildVersion "15"
116+
New-Package (Join-Path $PSScriptRoot "src\DatabaseMigrationTools\DatabaseMigration.Gallery.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch
117+
New-Package (Join-Path $PSScriptRoot "src\DatabaseMigrationTools\DatabaseMigration.SupportRequest.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch
118+
New-Package (Join-Path $PSScriptRoot "src\DatabaseMigrationTools\DatabaseMigration.Validation.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch
119+
New-Package (Join-Path $PSScriptRoot "src\AccountDeleter\Gallery.AccountDeleter.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch
120+
New-Package (Join-Path $PSScriptRoot "src\GitHubVulnerabilities2Db\GitHubVulnerabilities2Db.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch
121+
New-Package (Join-Path $PSScriptRoot "src\GalleryTools\Gallery.GalleryTools.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch
122+
New-Package (Join-Path $PSScriptRoot "src\VerifyGitHubVulnerabilities\VerifyGitHubVulnerabilities.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch
120123

121124
if (!$VerifyMicrosoftPackageVersion) { $VerifyMicrosoftPackageVersion = $SemanticVersion }
122-
New-Package (Join-Path $PSScriptRoot "src\VerifyMicrosoftPackage\VerifyMicrosoftPackage.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $VerifyMicrosoftPackageVersion -Branch $Branch -MSBuildVersion "15"
125+
New-Package (Join-Path $PSScriptRoot "src\VerifyMicrosoftPackage\VerifyMicrosoftPackage.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $VerifyMicrosoftPackageVersion -Branch $Branch
123126
} `
124127
-ev +BuildErrors
125128

126129
Invoke-BuildStep 'Signing the packages' {
127-
Sign-Packages -Configuration $Configuration -BuildNumber $BuildNumber -MSBuildVersion "15" `
130+
Sign-Packages -Configuration $Configuration -BuildNumber $BuildNumber `
128131
} `
129132
-ev +BuildErrors
130133

‎sign.thirdparty.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<ThirdPartyBinaries Include="Lucene.Net.Contrib.Snowball.dll" />
2727
<ThirdPartyBinaries Include="Lucene.Net.Contrib.SpellChecker.dll" />
2828
<ThirdPartyBinaries Include="Lucene.Net.dll" />
29-
<ThirdPartyBinaries Include="Markdig.dll" />
29+
<ThirdPartyBinaries Include="Markdig.Signed.dll" />
3030
<ThirdPartyBinaries Include="MarkdownSharp.dll" />
3131
<ThirdPartyBinaries Include="Microsoft.ApplicationServer.Caching.Client.dll" />
3232
<ThirdPartyBinaries Include="Microsoft.ApplicationServer.Caching.Core.dll" />

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

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

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

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Bootstrap/less/tables.less‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ th {
4545
.table {
4646
width: 100%;
4747
max-width: 100%;
48+
min-width: 290px;
4849
margin-bottom: @line-height-computed;
4950
// Cells
5051
> thead,

‎src/Bootstrap/less/theme/page-manage-organizations.less‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@
4242
display: inline-block;
4343
width: 100%;
4444
}
45+
46+
.required:after {
47+
color: red;
48+
content: " *";
49+
}
4550
}
4651

4752
.manage-members-listing tbody:first-child {

‎src/Bootstrap/less/theme/page-sign-in.less‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,9 @@
2727
.or-row {
2828
margin: 20px;
2929
}
30+
31+
.required:after{
32+
color: red;
33+
content: " *";
34+
}
3035
}

‎src/Bootstrap/less/theme/page-status.less‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@
6565
}
6666

6767
.table {
68+
word-break: break-word;
69+
6870
thead {
6971
th:nth-child(1) {
7072
width: 50%;

0 commit comments

Comments
 (0)