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

Commit 16d7dea

Browse files
xavierdecosterskofman1
xavierdecoster
authored and
skofman1
committed
Merge dev into master (#116)
* Added build script to create deployment package for NuGet.SupportRequests.Notifications (#108) * Delete unused Search.RebuildIndex and Search.UpdateIndex (#111) It looks like these were for the V2 index * Reverting from project.json style refs to packages.config in support request notifications job (#113) * Fix titles of supportrequest notifications jobs * No need to loop support request notifications jobs * Enable delay-signing on the jobs projects (#114) Enable delay-signing on the jobs projects Update build tools version and remove internal things (for simpler signing) Update to signed ServerCommon packages Update to signed NuGetGallery.Core Update to signed VCS package Use Dapper.StrongName Fix NuGet/Engineering#264 * No need to treat ISNULL warning as error if IS NOT NULL checks happened earlier in the WHERE clause (just keep the warning in CA)
1 parent d9d10e6 commit 16d7dea

56 files changed

Lines changed: 281 additions & 289 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.

‎.gitignore‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ bld/
2424
build/
2525
tools/
2626
.nuget/CredentialProviderBundle.zip
27+
.nuget/CredentialProvider.VSS.exe
28+
.nuget/EULA_Microsoft Visual Studio Team Services Credential Provider.docx
29+
.nuget/ThirdPartyNotices.txt
2730

2831
# Roslyn cache directories
2932
*.ide/
@@ -197,5 +200,6 @@ FakesAssemblies/
197200
*.webtestresult
198201

199202
# Vs2015
200-
.vs/config/applicationhost.config
201-
project.lock.json
203+
.vs/
204+
project.lock.json
205+
Results.*.xml

‎NuGet.Jobs.sln‎

Lines changed: 2 additions & 2 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 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26221.2
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Jobs.Common", "src\NuGet.Jobs.Common\NuGet.Jobs.Common.csproj", "{4B4B1EFB-8F33-42E6-B79F-54E7F3293D31}"
77
EndProject

‎build.ps1‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22
param (
33
[ValidateSet("debug", "release")]
44
[string]$Configuration = 'debug',
5-
[ValidateSet("Release","rtm", "rc", "beta", "beta2", "final", "xprivate", "zlocal")]
6-
[string]$ReleaseLabel = 'zlocal',
75
[int]$BuildNumber,
86
[switch]$SkipRestore,
97
[switch]$CleanCache,
108
[string]$SimpleVersion = '1.0.0',
119
[string]$SemanticVersion = '1.0.0-zlocal',
12-
[string]$Branch,
10+
[string]$Branch = 'zlocal',
1311
[string]$CommitSHA,
14-
[string]$BuildBranch = 'a8c27302d8720d094c2dce87e00324d84b4697b2'
12+
[string]$BuildBranch = '1c479a7381ebbc0fe1fded765de70d513b8bd68e'
1513
)
1614

1715
# For TeamCity - If any issue occurs, this script fails the build. - By default, TeamCity returns an exit code of 0 for all powershell scripts, even if they fail
@@ -63,6 +61,9 @@ if (-not $BuildNumber) {
6361
Trace-Log "Build #$BuildNumber started at $startTime"
6462

6563
$BuildErrors = @()
64+
65+
Invoke-BuildStep 'Getting private build tools' { Install-PrivateBuildTools } `
66+
-ev +BuildErrors
6667

6768
Invoke-BuildStep 'Cleaning test results' { Clean-Tests } `
6869
-ev +BuildErrors
@@ -93,7 +94,8 @@ Invoke-BuildStep 'Prepare Validation.Callback.Vcs Package' { Prepare-Vcs-Callbac
9394
-ev +BuildErrors
9495

9596
Invoke-BuildStep 'Creating artifacts' {
96-
$Projects = "src/Stats.CollectAzureCdnLogs/Stats.CollectAzureCdnLogs.csproj", `
97+
$Projects = `
98+
"src/Stats.CollectAzureCdnLogs/Stats.CollectAzureCdnLogs.csproj", `
9799
"src/Stats.AggregateCdnDownloadsInGallery/Stats.AggregateCdnDownloadsInGallery.csproj", `
98100
"src/Stats.ImportAzureCdnStatistics/Stats.ImportAzureCdnStatistics.csproj", `
99101
"src/Stats.CreateAzureCdnWarehouseReports/Stats.CreateAzureCdnWarehouseReports.csproj", `
@@ -108,7 +110,7 @@ Invoke-BuildStep 'Creating artifacts' {
108110
"src/NuGet.SupportRequests.Notifications/NuGet.SupportRequests.Notifications.csproj"
109111

110112
Foreach ($Project in $Projects) {
111-
New-Package (Join-Path $PSScriptRoot "$Project") -Configuration $Configuration -BuildNumber $BuildNumber -ReleaseLabel $ReleaseLabel -Version $SemanticVersion -Branch $Branch
113+
New-Package (Join-Path $PSScriptRoot "$Project") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch
112114
}
113115
} `
114116
-ev +BuildErrors

‎buildandtest.ps1‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22
param (
33
[ValidateSet("debug", "release")]
44
[string]$Configuration = 'debug',
5-
[ValidateSet("Release","rtm", "rc", "beta", "beta2", "final", "xprivate", "zlocal")]
6-
[string]$ReleaseLabel = 'zlocal',
75
[int]$BuildNumber,
86
[switch]$SkipRestore,
97
[switch]$CleanCache,
108
[string]$SimpleVersion = '1.0.0',
119
[string]$SemanticVersion = '1.0.0-zlocal',
12-
[string]$Branch,
10+
[string]$Branch = 'zlocal',
1311
[string]$CommitSHA
1412
)
1513

1614
$ScriptPath = Split-Path $MyInvocation.InvocationName
1715

18-
& "$ScriptPath\build.ps1" -Configuration $Configuration -ReleaseLabel $ReleaseLabel -BuildNumber $BuildNumber -SkipRestore:$SkipRestore -CleanCache:$CleanCache -SimpleVersion "$SimpleVersion" -SemanticVersion "$SemanticVersion" -Branch "$Branch" -CommitSHA "$CommitSHA"
16+
& "$ScriptPath\build.ps1" -Configuration $Configuration -BuildNumber $BuildNumber -SkipRestore:$SkipRestore -CleanCache:$CleanCache -SimpleVersion "$SimpleVersion" -SemanticVersion "$SemanticVersion" -Branch "$Branch" -CommitSHA "$CommitSHA"
1917
& "$ScriptPath\test.ps1" -Configuration $Configuration -BuildNumber $BuildNumber

‎src/ArchivePackages/App.config‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
55
</startup>
66
<runtime>
77
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
88
<dependentAssembly>
9-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
10-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
9+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
10+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
1111
</dependentAssembly>
1212
<dependentAssembly>
13-
<assemblyIdentity name="Microsoft.Azure.KeyVault" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
14-
<bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0"/>
13+
<assemblyIdentity name="Microsoft.Azure.KeyVault" publicKeyToken="31bf3856ad364e35" culture="neutral" />
14+
<bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
1515
</dependentAssembly>
1616
<dependentAssembly>
17-
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
18-
<bindingRedirect oldVersion="0.0.0.0-3.13.4.878" newVersion="3.13.4.878"/>
17+
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform" publicKeyToken="31bf3856ad364e35" culture="neutral" />
18+
<bindingRedirect oldVersion="0.0.0.0-3.13.4.878" newVersion="3.13.4.878" />
1919
</dependentAssembly>
2020
<dependentAssembly>
21-
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
22-
<bindingRedirect oldVersion="0.0.0.0-3.13.4.878" newVersion="3.13.4.878"/>
21+
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
22+
<bindingRedirect oldVersion="0.0.0.0-3.13.4.878" newVersion="3.13.4.878" />
2323
</dependentAssembly>
2424
<dependentAssembly>
25-
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
26-
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0"/>
25+
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
26+
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
2727
</dependentAssembly>
2828
<dependentAssembly>
29-
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
30-
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0"/>
29+
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
30+
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
3131
</dependentAssembly>
3232
<dependentAssembly>
33-
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
34-
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0"/>
33+
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
34+
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
3535
</dependentAssembly>
3636
</assemblyBinding>
3737
</runtime>

‎src/ArchivePackages/ArchivePackages.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Dapper, Version=1.50.2.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\..\packages\Dapper.1.50.2\lib\net451\Dapper.dll</HintPath>
40-
<Private>True</Private>
38+
<Reference Include="Dapper.StrongName, Version=1.50.2.0, Culture=neutral, PublicKeyToken=e3e8412083d25dd3, processorArchitecture=MSIL">
39+
<HintPath>..\..\packages\Dapper.StrongName.1.50.2\lib\net451\Dapper.StrongName.dll</HintPath>
4140
</Reference>
4241
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4342
<HintPath>..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
@@ -120,6 +119,7 @@
120119
</ProjectReference>
121120
</ItemGroup>
122121
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
122+
<Import Project="..\..\build\sign.targets" Condition="Exists('..\..\build\sign.targets')" />
123123
<PropertyGroup>
124124
<PostBuildEvent>move /y App.config ArchivePackages.exe.config</PostBuildEvent>
125125
</PropertyGroup>

‎src/ArchivePackages/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Dapper" version="1.50.2" targetFramework="net452" />
3+
<package id="Dapper.StrongName" version="1.50.2" targetFramework="net452" />
44
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
55
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
66
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,8 @@
5353
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
5454
<Private>True</Private>
5555
</Reference>
56-
<Reference Include="NuGet.Services.Logging, Version=1.0.21.0, Culture=neutral, processorArchitecture=MSIL">
57-
<HintPath>..\..\packages\NuGet.Services.Logging.1.0.21-r-develop\lib\net452\NuGet.Services.Logging.dll</HintPath>
58-
<Private>True</Private>
56+
<Reference Include="NuGet.Services.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
57+
<HintPath>..\..\packages\NuGet.Services.Logging.2.1.0\lib\net452\NuGet.Services.Logging.dll</HintPath>
5958
</Reference>
6059
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
6160
<HintPath>..\..\packages\Serilog.2.2.1\lib\net45\Serilog.dll</HintPath>
@@ -73,9 +72,8 @@
7372
<HintPath>..\..\packages\Serilog.Extensions.Logging.1.2.0\lib\net45\Serilog.Extensions.Logging.dll</HintPath>
7473
<Private>True</Private>
7574
</Reference>
76-
<Reference Include="Serilog.Sinks.ApplicationInsights, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
77-
<HintPath>..\..\packages\Serilog.Sinks.ApplicationInsights.2.1.0\lib\net45\Serilog.Sinks.ApplicationInsights.dll</HintPath>
78-
<Private>True</Private>
75+
<Reference Include="Serilog.Sinks.ApplicationInsights, Version=2.2.1.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
76+
<HintPath>..\..\packages\Serilog.Sinks.ApplicationInsights.2.2.1\lib\net45\Serilog.Sinks.ApplicationInsights.dll</HintPath>
7977
</Reference>
8078
<Reference Include="Serilog.Sinks.ColoredConsole, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
8179
<HintPath>..\..\packages\Serilog.Sinks.ColoredConsole.2.0.0\lib\net45\Serilog.Sinks.ColoredConsole.dll</HintPath>
@@ -136,6 +134,7 @@
136134
</EmbeddedResource>
137135
</ItemGroup>
138136
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
137+
<Import Project="..\..\build\sign.targets" Condition="Exists('..\..\build\sign.targets')" />
139138
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
140139
Other similar extension points exist, see Microsoft.Common.targets.
141140
<Target Name="BeforeBuild">

‎src/Gallery.CredentialExpiration/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<package id="Microsoft.Extensions.Logging" version="1.0.0" targetFramework="net452" />
66
<package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.0" targetFramework="net451" />
77
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
8-
<package id="NuGet.Services.Logging" version="1.0.21-r-develop" targetFramework="net452" />
8+
<package id="NuGet.Services.Logging" version="2.1.0" targetFramework="net452" />
99
<package id="Serilog" version="2.2.1" targetFramework="net452" />
1010
<package id="Serilog.Enrichers.Environment" version="2.1.0" targetFramework="net452" />
1111
<package id="Serilog.Enrichers.Process" version="2.0.0" targetFramework="net452" />
1212
<package id="Serilog.Extensions.Logging" version="1.2.0" targetFramework="net452" />
13-
<package id="Serilog.Sinks.ApplicationInsights" version="2.1.0" targetFramework="net452" />
13+
<package id="Serilog.Sinks.ApplicationInsights" version="2.2.1" targetFramework="net452" />
1414
<package id="Serilog.Sinks.ColoredConsole" version="2.0.0" targetFramework="net452" />
1515
<package id="SerilogTraceListener" version="2.0.10027" targetFramework="net452" />
1616
<package id="System.Collections" version="4.0.11" targetFramework="net451" />

‎src/HandlePackageEdits/HandlePackageEdits.csproj‎

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="Dapper, Version=1.50.2.0, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\..\packages\Dapper.1.50.2\lib\net451\Dapper.dll</HintPath>
39-
<Private>True</Private>
37+
<Reference Include="Dapper.StrongName, Version=1.50.2.0, Culture=neutral, PublicKeyToken=e3e8412083d25dd3, processorArchitecture=MSIL">
38+
<HintPath>..\..\packages\Dapper.StrongName.1.50.2\lib\net451\Dapper.StrongName.dll</HintPath>
4039
</Reference>
4140
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
4241
<HintPath>..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
@@ -107,40 +106,32 @@
107106
<Private>True</Private>
108107
</Reference>
109108
<Reference Include="NuGet.Common, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
110-
<HintPath>..\..\packages\NuGet.Common.3.5.0-beta-final\lib\net45\NuGet.Common.dll</HintPath>
111-
<Private>True</Private>
109+
<HintPath>..\..\packages\NuGet.Common.3.5.0-rc1-final\lib\net45\NuGet.Common.dll</HintPath>
112110
</Reference>
113111
<Reference Include="NuGet.Frameworks, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
114-
<HintPath>..\..\packages\NuGet.Frameworks.3.5.0-beta-final\lib\net45\NuGet.Frameworks.dll</HintPath>
115-
<Private>True</Private>
112+
<HintPath>..\..\packages\NuGet.Frameworks.3.5.0-rc1-final\lib\net45\NuGet.Frameworks.dll</HintPath>
116113
</Reference>
117114
<Reference Include="NuGet.Logging, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
118115
<HintPath>..\..\packages\NuGet.Logging.3.5.0-beta-1160\lib\net45\NuGet.Logging.dll</HintPath>
119116
<Private>True</Private>
120117
</Reference>
121118
<Reference Include="NuGet.Packaging, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
122-
<HintPath>..\..\packages\NuGet.Packaging.3.5.0-beta-final\lib\net45\NuGet.Packaging.dll</HintPath>
123-
<Private>True</Private>
119+
<HintPath>..\..\packages\NuGet.Packaging.3.5.0-rc1-final\lib\net45\NuGet.Packaging.dll</HintPath>
124120
</Reference>
125121
<Reference Include="NuGet.Packaging.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
126-
<HintPath>..\..\packages\NuGet.Packaging.Core.3.5.0-beta-final\lib\net45\NuGet.Packaging.Core.dll</HintPath>
127-
<Private>True</Private>
122+
<HintPath>..\..\packages\NuGet.Packaging.Core.3.5.0-rc1-final\lib\net45\NuGet.Packaging.Core.dll</HintPath>
128123
</Reference>
129124
<Reference Include="NuGet.Packaging.Core.Types, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
130-
<HintPath>..\..\packages\NuGet.Packaging.Core.Types.3.5.0-beta-final\lib\net45\NuGet.Packaging.Core.Types.dll</HintPath>
131-
<Private>True</Private>
125+
<HintPath>..\..\packages\NuGet.Packaging.Core.Types.3.5.0-rc1-final\lib\net45\NuGet.Packaging.Core.Types.dll</HintPath>
132126
</Reference>
133-
<Reference Include="NuGet.Services.Logging, Version=1.0.21.0, Culture=neutral, processorArchitecture=MSIL">
134-
<HintPath>..\..\packages\NuGet.Services.Logging.1.0.21-r-develop\lib\net452\NuGet.Services.Logging.dll</HintPath>
135-
<Private>True</Private>
127+
<Reference Include="NuGet.Services.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
128+
<HintPath>..\..\packages\NuGet.Services.Logging.2.1.0\lib\net452\NuGet.Services.Logging.dll</HintPath>
136129
</Reference>
137130
<Reference Include="NuGet.Versioning, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
138-
<HintPath>..\..\packages\NuGet.Versioning.3.5.0-beta-final\lib\net45\NuGet.Versioning.dll</HintPath>
139-
<Private>True</Private>
131+
<HintPath>..\..\packages\NuGet.Versioning.3.5.0-rc1-final\lib\net45\NuGet.Versioning.dll</HintPath>
140132
</Reference>
141-
<Reference Include="NuGetGallery.Core, Version=3.0.2118.0, Culture=neutral, processorArchitecture=MSIL">
142-
<HintPath>..\..\packages\NuGetGallery.Core.3.0.2118-r-master\lib\net452\NuGetGallery.Core.dll</HintPath>
143-
<Private>True</Private>
133+
<Reference Include="NuGetGallery.Core, Version=2.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
134+
<HintPath>..\..\packages\NuGetGallery.Core.2.1.1\lib\net452\NuGetGallery.Core.dll</HintPath>
144135
</Reference>
145136
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
146137
<HintPath>..\..\packages\Serilog.2.2.1\lib\net45\Serilog.dll</HintPath>
@@ -158,9 +149,8 @@
158149
<HintPath>..\..\packages\Serilog.Extensions.Logging.1.2.0\lib\net45\Serilog.Extensions.Logging.dll</HintPath>
159150
<Private>True</Private>
160151
</Reference>
161-
<Reference Include="Serilog.Sinks.ApplicationInsights, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
162-
<HintPath>..\..\packages\Serilog.Sinks.ApplicationInsights.2.1.0\lib\net45\Serilog.Sinks.ApplicationInsights.dll</HintPath>
163-
<Private>True</Private>
152+
<Reference Include="Serilog.Sinks.ApplicationInsights, Version=2.2.1.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
153+
<HintPath>..\..\packages\Serilog.Sinks.ApplicationInsights.2.2.1\lib\net45\Serilog.Sinks.ApplicationInsights.dll</HintPath>
164154
</Reference>
165155
<Reference Include="Serilog.Sinks.ColoredConsole, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
166156
<HintPath>..\..\packages\Serilog.Sinks.ColoredConsole.2.0.0\lib\net45\Serilog.Sinks.ColoredConsole.dll</HintPath>
@@ -214,6 +204,7 @@
214204
</ProjectReference>
215205
</ItemGroup>
216206
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
207+
<Import Project="..\..\build\sign.targets" Condition="Exists('..\..\build\sign.targets')" />
217208
<Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
218209
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
219210
<PropertyGroup>

0 commit comments

Comments
 (0)