Skip to content
This repository was archived by the owner on Jul 30, 2024. It is now read-only.

Commit 418a50f

Browse files
author
Scott Bommarito
authored
Merge pull request #598 from NuGet/sb-ri1025
2 parents f05ccca + 06a3379 commit 418a50f

58 files changed

Lines changed: 665 additions & 546 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.

‎NuGet.Jobs.sln‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Validation", "Validation",
5757
EndProject
5858
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.Common", "src\Validation.Common\Validation.Common.csproj", "{2539DDF3-0CC5-4A03-B5F9-39B47744A7BD}"
5959
EndProject
60-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.Callback.Vcs", "src\Validation.Callback.Vcs\Validation.Callback.Vcs.csproj", "{185EF6D4-2172-40B1-A80E-811CE9D85840}"
61-
EndProject
6260
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.Runner", "src\Validation.Runner\Validation.Runner.csproj", "{1EB7FF94-9B4A-4008-8F8E-5F867C0B00DE}"
6361
EndProject
6462
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Gallery", "Gallery", "{88725659-D5F8-49F9-9B7E-D87C5B9917D7}"
@@ -225,10 +223,6 @@ Global
225223
{2539DDF3-0CC5-4A03-B5F9-39B47744A7BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
226224
{2539DDF3-0CC5-4A03-B5F9-39B47744A7BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
227225
{2539DDF3-0CC5-4A03-B5F9-39B47744A7BD}.Release|Any CPU.Build.0 = Release|Any CPU
228-
{185EF6D4-2172-40B1-A80E-811CE9D85840}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
229-
{185EF6D4-2172-40B1-A80E-811CE9D85840}.Debug|Any CPU.Build.0 = Debug|Any CPU
230-
{185EF6D4-2172-40B1-A80E-811CE9D85840}.Release|Any CPU.ActiveCfg = Release|Any CPU
231-
{185EF6D4-2172-40B1-A80E-811CE9D85840}.Release|Any CPU.Build.0 = Release|Any CPU
232226
{1EB7FF94-9B4A-4008-8F8E-5F867C0B00DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
233227
{1EB7FF94-9B4A-4008-8F8E-5F867C0B00DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
234228
{1EB7FF94-9B4A-4008-8F8E-5F867C0B00DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -426,7 +420,6 @@ Global
426420
{CF7645A4-B4C0-4827-B6B0-AE42108071C6} = {57F34E9A-3A98-4E48-BF76-D49CB9CB3323}
427421
{3E0A20C8-C6D2-4762-955D-C7BF35C2C9A7} = {B9D03824-A9CA-43AC-86D6-8BB399B9A228}
428422
{2539DDF3-0CC5-4A03-B5F9-39B47744A7BD} = {678D7B14-F8BC-4193-99AF-2EE8AA390A02}
429-
{185EF6D4-2172-40B1-A80E-811CE9D85840} = {678D7B14-F8BC-4193-99AF-2EE8AA390A02}
430423
{1EB7FF94-9B4A-4008-8F8E-5F867C0B00DE} = {678D7B14-F8BC-4193-99AF-2EE8AA390A02}
431424
{FA8C7905-985F-4919-AAA9-4B9A252F4977} = {88725659-D5F8-49F9-9B7E-D87C5B9917D7}
432425
{12719498-B87E-4E92-8C2B-30046393CF85} = {BEC3DF4D-9A04-42C8-8B4F-D42750202B4D}

‎build.ps1‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ param (
99
[string]$SemanticVersion = '1.0.0-zlocal',
1010
[string]$Branch = 'zlocal',
1111
[string]$CommitSHA,
12-
[string]$BuildBranch = '80b8f1b4a1cfe57367881e59fca063866dcaaa42'
12+
[string]$BuildBranch = '795fed66b8bae2d248237ee5ec82e688e7174a42'
1313
)
1414

1515
$msBuildVersion = 15;
@@ -42,21 +42,6 @@ Function Clean-Tests {
4242
Remove-Item (Join-Path $PSScriptRoot "Results.*.xml")
4343
}
4444

45-
Function Prepare-Vcs-Callback {
46-
[CmdletBinding()]
47-
param()
48-
49-
Trace-Log 'Preparing Validation.Callback.Vcs Package'
50-
51-
$ZipPackagePath = "src\Validation.Callback.Vcs\obj\Validation.Callback.Vcs.zip"
52-
53-
if (Test-Path $ZipPackagePath) {
54-
Remove-Item $ZipPackagePath
55-
}
56-
57-
Build-Solution $Configuration $BuildNumber -MSBuildVersion "$msBuildVersion" "src\Validation.Callback.Vcs\Validation.Callback.Vcs.csproj" -Target "Package" -MSBuildProperties "/P:PackageLocation=obj\Validation.Callback.Vcs.zip" -SkipRestore
58-
}
59-
6045
Function Prepare-NuGetCDNRedirect {
6146
[CmdletBinding()]
6247
param()
@@ -132,13 +117,10 @@ Invoke-BuildStep 'Restoring solution packages' { `
132117

133118
Invoke-BuildStep 'Building solution' {
134119
param($Configuration, $BuildNumber, $SolutionPath, $SkipRestore)
135-
Build-Solution $Configuration $BuildNumber -MSBuildVersion "$msBuildVersion" $SolutionPath -SkipRestore:$SkipRestore `
120+
Build-Solution $Configuration $BuildNumber -MSBuildVersion "$msBuildVersion" $SolutionPath -MSBuildProperties "/m" -SkipRestore:$SkipRestore `
136121
} `
137122
-args $Configuration, $BuildNumber, (Join-Path $PSScriptRoot "NuGet.Jobs.sln"), $SkipRestore `
138123
-ev +BuildErrors
139-
140-
Invoke-BuildStep 'Prepare Validation.Callback.Vcs Package' { Prepare-Vcs-Callback } `
141-
-ev +BuildErrors
142124

143125
Invoke-BuildStep 'Prepare NuGetCDNRedirect Package' { Prepare-NuGetCDNRedirect } `
144126
-ev +BuildErrors
@@ -168,8 +150,6 @@ Invoke-BuildStep 'Creating artifacts' {
168150
"src/ArchivePackages/ArchivePackages.csproj", `
169151
"src/Search.GenerateAuxiliaryData/Search.GenerateAuxiliaryData.csproj", `
170152
"src/Stats.RollUpDownloadFacts/Stats.RollUpDownloadFacts.csproj", `
171-
"src/Validation.Callback.Vcs/Validation.Callback.Vcs.csproj", `
172-
"src/Validation.Callback.Vcs/Validation.Callback.Vcs.WebApp.nuspec", `
173153
"src/Validation.Runner/Validation.Runner.csproj", `
174154
"src/NuGet.SupportRequests.Notifications/NuGet.SupportRequests.Notifications.csproj", `
175155
"src/Validation.Helper/Validation.Helper.csproj", `

‎sign.thirdparty.targets‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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="Antlr3.Runtime.dll" />
10+
<ThirdPartyBinaries Include="Autofac.dll" />
11+
<ThirdPartyBinaries Include="Autofac.Extensions.DependencyInjection.dll" />
12+
<ThirdPartyBinaries Include="Dapper.StrongName.dll" />
13+
<ThirdPartyBinaries Include="Elmah.dll" />
14+
<ThirdPartyBinaries Include="ICSharpCode.SharpZipLib.dll" />
15+
<ThirdPartyBinaries Include="MarkdownSharp.dll" />
16+
<ThirdPartyBinaries Include="Newtonsoft.Json.dll" />
17+
<ThirdPartyBinaries Include="Newtonsoft.Json.Schema.dll" />
18+
<ThirdPartyBinaries Include="Owin.dll" />
19+
<ThirdPartyBinaries Include="Serilog.dll" />
20+
<ThirdPartyBinaries Include="Serilog.Enrichers.Environment.dll" />
21+
<ThirdPartyBinaries Include="Serilog.Enrichers.Process.dll" />
22+
<ThirdPartyBinaries Include="Serilog.Extensions.Logging.dll" />
23+
<ThirdPartyBinaries Include="Serilog.Sinks.ApplicationInsights.dll" />
24+
<ThirdPartyBinaries Include="Serilog.Sinks.ColoredConsole.dll" />
25+
<ThirdPartyBinaries Include="SerilogTraceListener.dll" />
26+
<ThirdPartyBinaries Include="UAParser.dll" />
27+
</ItemGroup>
28+
<ItemGroup>
29+
<FilesToSign Include="$(OutDir)%(ThirdPartyBinaries.Identity)" Condition="Exists('$(OutDir)%(ThirdPartyBinaries.Identity)')">
30+
<Authenticode>3PartySHA2</Authenticode>
31+
</FilesToSign>
32+
</ItemGroup>
33+
<Message Text="Files to sign:%0A@(FilesToSign, '%0A')" Importance="High" />
34+
</Target>
35+
</Project>

‎src/ArchivePackages/ArchivePackages.csproj‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@
6565
</ProjectReference>
6666
</ItemGroup>
6767
<ItemGroup>
68+
<PackageReference Include="MicroBuild.Core">
69+
<Version>0.3.0</Version>
70+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
71+
<PrivateAssets>all</PrivateAssets>
72+
</PackageReference>
6873
<PackageReference Include="Dapper.StrongName">
6974
<Version>1.50.2</Version>
7075
</PackageReference>
@@ -87,7 +92,15 @@
8792
<Version>7.1.2</Version>
8893
</PackageReference>
8994
</ItemGroup>
90-
<ItemGroup />
95+
<PropertyGroup>
96+
<SignPath>..\..\build</SignPath>
97+
<SignPath Condition="'$(BUILD_SOURCESDIRECTORY)' != ''">$(BUILD_SOURCESDIRECTORY)\build</SignPath>
98+
<SignPath Condition="'$(NuGetBuildPath)' != ''">$(NuGetBuildPath)</SignPath>
99+
<SignType Condition="'$(SignType)' == ''">none</SignType>
100+
</PropertyGroup>
91101
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
92-
<Import Project="..\..\build\sign.targets" Condition="Exists('..\..\build\sign.targets')" />
102+
<Import Project="$(SignPath)\sign.targets" Condition="Exists('$(SignPath)\sign.targets')" />
103+
<Import Project="$(SignPath)\sign.microbuild.targets" Condition="Exists('$(SignPath)\sign.microbuild.targets')" />
104+
<Import Project="$(SignPath)\sign.scripts.targets" Condition="Exists('$(SignPath)\sign.scripts.targets')" />
105+
<Import Project="..\..\sign.thirdparty.targets" />
93106
</Project>

‎src/CopyAzureContainer/CopyAzureContainer.csproj‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,29 @@
7171
<PackageReference Include="WindowsAzure.Storage">
7272
<Version>7.1.2</Version>
7373
</PackageReference>
74+
<PackageReference Include="MicroBuild.Core">
75+
<Version>0.3.0</Version>
76+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
77+
<PrivateAssets>all</PrivateAssets>
78+
</PackageReference>
7479
</ItemGroup>
7580
<ItemGroup>
7681
<Content Include="tools\azcopy\ReadMe.txt" />
7782
</ItemGroup>
7883
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
84+
<PropertyGroup>
85+
<SignPath>..\..\build</SignPath>
86+
<SignPath Condition="'$(BUILD_SOURCESDIRECTORY)' != ''">$(BUILD_SOURCESDIRECTORY)\build</SignPath>
87+
<SignPath Condition="'$(NuGetBuildPath)' != ''">$(NuGetBuildPath)</SignPath>
88+
<SignType Condition="'$(SignType)' == ''">none</SignType>
89+
</PropertyGroup>
90+
<Import Project="$(SignPath)\sign.targets" Condition="Exists('$(SignPath)\sign.targets')" />
91+
<Import Project="$(SignPath)\sign.microbuild.targets" Condition="Exists('$(SignPath)\sign.microbuild.targets')" />
92+
<ItemGroup>
93+
<PowerShellScriptsToSign Include="InstallAzCopy.ps1"/>
94+
<PowerShellScriptsToNotSign Include="PreDeploy.ps1"/>
95+
<ExecutablesToNotSign Include="nssm.exe"/>
96+
</ItemGroup>
97+
<Import Project="$(SignPath)\sign.scripts.targets" Condition="Exists('$(SignPath)\sign.scripts.targets')" />
98+
<Import Project="..\..\sign.thirdparty.targets" />
7999
</Project>

‎src/Gallery.CredentialExpiration/Gallery.CredentialExpiration.csproj‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@
8484
</EmbeddedResource>
8585
</ItemGroup>
8686
<ItemGroup>
87+
<PackageReference Include="MicroBuild.Core">
88+
<Version>0.3.0</Version>
89+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
90+
<PrivateAssets>all</PrivateAssets>
91+
</PackageReference>
8792
<PackageReference Include="Microsoft.Data.Edm">
8893
<Version>5.7.0</Version>
8994
</PackageReference>
@@ -106,6 +111,15 @@
106111
<Version>7.1.2</Version>
107112
</PackageReference>
108113
</ItemGroup>
114+
<PropertyGroup>
115+
<SignPath>..\..\build</SignPath>
116+
<SignPath Condition="'$(BUILD_SOURCESDIRECTORY)' != ''">$(BUILD_SOURCESDIRECTORY)\build</SignPath>
117+
<SignPath Condition="'$(NuGetBuildPath)' != ''">$(NuGetBuildPath)</SignPath>
118+
<SignType Condition="'$(SignType)' == ''">none</SignType>
119+
</PropertyGroup>
109120
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
110-
<Import Project="..\..\build\sign.targets" Condition="Exists('..\..\build\sign.targets')" />
121+
<Import Project="$(SignPath)\sign.targets" Condition="Exists('$(SignPath)\sign.targets')" />
122+
<Import Project="$(SignPath)\sign.microbuild.targets" Condition="Exists('$(SignPath)\sign.microbuild.targets')" />
123+
<Import Project="$(SignPath)\sign.scripts.targets" Condition="Exists('$(SignPath)\sign.scripts.targets')" />
124+
<Import Project="..\..\sign.thirdparty.targets" />
111125
</Project>

‎src/Gallery.Maintenance/Gallery.Maintenance.csproj‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@
6464
</ProjectReference>
6565
</ItemGroup>
6666
<ItemGroup>
67+
<PackageReference Include="MicroBuild.Core">
68+
<Version>0.3.0</Version>
69+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
70+
<PrivateAssets>all</PrivateAssets>
71+
</PackageReference>
6772
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
6873
<Version>1.0.0</Version>
6974
</PackageReference>
@@ -74,6 +79,15 @@
7479
<Version>4.3.3</Version>
7580
</PackageReference>
7681
</ItemGroup>
82+
<PropertyGroup>
83+
<SignPath>..\..\build</SignPath>
84+
<SignPath Condition="'$(BUILD_SOURCESDIRECTORY)' != ''">$(BUILD_SOURCESDIRECTORY)\build</SignPath>
85+
<SignPath Condition="'$(NuGetBuildPath)' != ''">$(NuGetBuildPath)</SignPath>
86+
<SignType Condition="'$(SignType)' == ''">none</SignType>
87+
</PropertyGroup>
7788
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
78-
<Import Project="..\..\build\sign.targets" Condition="Exists('..\..\build\sign.targets')" />
89+
<Import Project="$(SignPath)\sign.targets" Condition="Exists('$(SignPath)\sign.targets')" />
90+
<Import Project="$(SignPath)\sign.microbuild.targets" Condition="Exists('$(SignPath)\sign.microbuild.targets')" />
91+
<Import Project="$(SignPath)\sign.scripts.targets" Condition="Exists('$(SignPath)\sign.scripts.targets')" />
92+
<Import Project="..\..\sign.thirdparty.targets" />
7993
</Project>

‎src/LoadTests/LoadTests.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
</Choose>
8383
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
8484
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
85-
<Import Project="..\..\build\sign.targets" Condition="Exists('..\..\build\sign.targets')" />
8685
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8786
Other similar extension points exist, see Microsoft.Common.targets.
8887
<Target Name="BeforeBuild">

‎src/Monitoring.RebootSearchInstance/Monitoring.RebootSearchInstance.csproj‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,13 @@
7777
<Name>Validation.Common.Job</Name>
7878
</ProjectReference>
7979
</ItemGroup>
80+
<ItemGroup>
81+
<PackageReference Include="MicroBuild.Core">
82+
<Version>0.3.0</Version>
83+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
84+
<PrivateAssets>all</PrivateAssets>
85+
</PackageReference>
86+
</ItemGroup>
8087
<ItemGroup>
8188
<Content Include="Scripts\nssm.exe" />
8289
</ItemGroup>
@@ -85,6 +92,10 @@
8592
<SignPath>..\..\build</SignPath>
8693
<SignPath Condition="'$(BUILD_SOURCESDIRECTORY)' != ''">$(BUILD_SOURCESDIRECTORY)\build</SignPath>
8794
<SignPath Condition="'$(NuGetBuildPath)' != ''">$(NuGetBuildPath)</SignPath>
95+
<SignType Condition="'$(SignType)' == ''">none</SignType>
8896
</PropertyGroup>
8997
<Import Project="$(SignPath)\sign.targets" Condition="Exists('$(SignPath)\sign.targets')" />
98+
<Import Project="$(SignPath)\sign.microbuild.targets" Condition="Exists('$(SignPath)\sign.microbuild.targets')" />
99+
<Import Project="$(SignPath)\sign.scripts.targets" Condition="Exists('$(SignPath)\sign.scripts.targets')" />
100+
<Import Project="..\..\sign.thirdparty.targets" />
90101
</Project>

‎src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@
8888
<PackageReference Include="Dapper.StrongName">
8989
<Version>1.50.2</Version>
9090
</PackageReference>
91+
<PackageReference Include="MicroBuild.Core">
92+
<Version>0.3.0</Version>
93+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
94+
<PrivateAssets>all</PrivateAssets>
95+
</PackageReference>
9196
<PackageReference Include="Microsoft.Extensions.DependencyInjection">
9297
<Version>1.1.1</Version>
9398
</PackageReference>
@@ -117,6 +122,9 @@
117122
<SignPath>..\..\build</SignPath>
118123
<SignPath Condition="'$(BUILD_SOURCESDIRECTORY)' != ''">$(BUILD_SOURCESDIRECTORY)\build</SignPath>
119124
<SignPath Condition="'$(NuGetBuildPath)' != ''">$(NuGetBuildPath)</SignPath>
125+
<SignType Condition="'$(SignType)' == ''">none</SignType>
120126
</PropertyGroup>
121127
<Import Project="$(SignPath)\sign.targets" Condition="Exists('$(SignPath)\sign.targets')" />
128+
<Import Project="$(SignPath)\sign.microbuild.targets" Condition="Exists('$(SignPath)\sign.microbuild.targets')" />
129+
<Import Project="..\..\sign.thirdparty.targets" />
122130
</Project>

0 commit comments

Comments
 (0)