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

Commit 4ebdd67

Browse files
cristinamanumcristinamanum
authored
Merge pull request #469 from NuGet/dev
RI Dev ->Master Deployment 2018-06-27
2 parents 135fe02 + 6c8d8e9 commit 4ebdd67

204 files changed

Lines changed: 5086 additions & 2972 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: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.PackageSigning.V
9999
EndProject
100100
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.PackageSigning.ValidateCertificate.Tests", "tests\Validation.PackageSigning.ValidateCertificate.Tests\Validation.PackageSigning.ValidateCertificate.Tests.csproj", "{5ACE7756-F8D0-4D90-9957-872DE4A1381E}"
101101
EndProject
102-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.PackageSigning.Helpers", "tests\Validation.PackageSigning.Helpers\Validation.PackageSigning.Helpers.csproj", "{2C5BE067-ADFD-49E3-BA9F-13A74436E5DB}"
102+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.ContextHelpers", "tests\Validation.PackageSigning.Helpers\Tests.ContextHelpers.csproj", "{2C5BE067-ADFD-49E3-BA9F-13A74436E5DB}"
103103
EndProject
104104
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.PackageSigning.Core.Tests", "tests\Validation.PackageSigning.Core.Tests\Validation.PackageSigning.Core.Tests.csproj", "{B4B7564A-965B-447B-927F-6749E2C08880}"
105105
EndProject
@@ -131,6 +131,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monitoring.PackageLag", "sr
131131
EndProject
132132
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.CredentialExpiration", "tests\Tests.CredentialExpiration\Tests.CredentialExpiration.csproj", "{60152AB1-2EB4-4D44-B6D6-EEE24209A1F7}"
133133
EndProject
134+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Services.Revalidate", "src\NuGet.Services.Revalidate\NuGet.Services.Revalidate.csproj", "{1963909D-8BE3-4CB8-B57E-AB6A8CB22FED}"
135+
EndProject
136+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Services.Revalidate.Tests", "tests\NuGet.Services.Revalidate.Tests\NuGet.Services.Revalidate.Tests.csproj", "{19780DCB-B307-4254-B10C-4335FC784DEA}"
137+
EndProject
134138
Global
135139
GlobalSection(SolutionConfigurationPlatforms) = preSolution
136140
Debug|Any CPU = Debug|Any CPU
@@ -339,6 +343,14 @@ Global
339343
{60152AB1-2EB4-4D44-B6D6-EEE24209A1F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
340344
{60152AB1-2EB4-4D44-B6D6-EEE24209A1F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
341345
{60152AB1-2EB4-4D44-B6D6-EEE24209A1F7}.Release|Any CPU.Build.0 = Release|Any CPU
346+
{1963909D-8BE3-4CB8-B57E-AB6A8CB22FED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
347+
{1963909D-8BE3-4CB8-B57E-AB6A8CB22FED}.Debug|Any CPU.Build.0 = Debug|Any CPU
348+
{1963909D-8BE3-4CB8-B57E-AB6A8CB22FED}.Release|Any CPU.ActiveCfg = Release|Any CPU
349+
{1963909D-8BE3-4CB8-B57E-AB6A8CB22FED}.Release|Any CPU.Build.0 = Release|Any CPU
350+
{19780DCB-B307-4254-B10C-4335FC784DEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
351+
{19780DCB-B307-4254-B10C-4335FC784DEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
352+
{19780DCB-B307-4254-B10C-4335FC784DEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
353+
{19780DCB-B307-4254-B10C-4335FC784DEA}.Release|Any CPU.Build.0 = Release|Any CPU
342354
EndGlobalSection
343355
GlobalSection(SolutionProperties) = preSolution
344356
HideSolutionNode = FALSE
@@ -394,6 +406,8 @@ Global
394406
{CAE45AC9-F11B-4215-9D1A-C98BC0F1F687} = {6A776396-02B1-475D-A104-26940ADB04AB}
395407
{B5147169-E941-4CF8-9FCD-1C123ACD3149} = {814F9B31-4AF3-46CC-AD61-CEB40F47083A}
396408
{60152AB1-2EB4-4D44-B6D6-EEE24209A1F7} = {6A776396-02B1-475D-A104-26940ADB04AB}
409+
{1963909D-8BE3-4CB8-B57E-AB6A8CB22FED} = {678D7B14-F8BC-4193-99AF-2EE8AA390A02}
410+
{19780DCB-B307-4254-B10C-4335FC784DEA} = {6A776396-02B1-475D-A104-26940ADB04AB}
397411
EndGlobalSection
398412
GlobalSection(ExtensibilityGlobals) = postSolution
399413
SolutionGuid = {284A7AC3-FB43-4F1F-9C9C-2AF0E1F46C2B}

‎build.ps1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ Invoke-BuildStep 'Set version metadata in AssemblyInfo.cs' { `
106106
"$PSScriptRoot\src\CopyAzureContainer\Properties\AssemblyInfo.g.cs",
107107
"$PSScriptRoot\src\NuGetCDNRedirect\Properties\AssemblyInfo.g.cs",
108108
"$PSScriptRoot\src\NuGet.Services.Validation.Orchestrator\Properties\AssemblyInfo.g.cs",
109+
"$PSScriptRoot\src\NuGet.Services.Revalidate\Properties\AssemblyInfo.g.cs",
109110
"$PSScriptRoot\src\Stats.CollectAzureChinaCDNLogs\Properties\AssemblyInfo.g.cs",
110111
"$PSScriptRoot\src\Validation.PackageSigning.ProcessSignature\Properties\AssemblyInfo.g.cs",
111112
"$PSScriptRoot\src\Validation.PackageSigning.ValidateCertificate\Properties\AssemblyInfo.g.cs",
@@ -167,6 +168,7 @@ Invoke-BuildStep 'Creating artifacts' {
167168
"src/CopyAzureContainer/CopyAzureContainer.csproj", `
168169
"src/NuGetCDNRedirect/NuGetCDNRedirect.csproj", `
169170
"src/NuGet.Services.Validation.Orchestrator/NuGet.Services.Validation.Orchestrator.csproj", `
171+
"src/NuGet.Services.Revalidate/NuGet.Services.Revalidate.csproj", `
170172
"src/Stats.CollectAzureChinaCDNLogs/Stats.CollectAzureChinaCDNLogs.csproj", `
171173
"src/Validation.PackageSigning.ProcessSignature/Validation.PackageSigning.ProcessSignature.csproj", `
172174
"src/Validation.PackageSigning.ValidateCertificate/Validation.PackageSigning.ValidateCertificate.csproj", `

‎src/ArchivePackages/App.config‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,4 @@
33
<startup>
44
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
55
</startup>
6-
<runtime>
7-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8-
<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"/>
11-
</dependentAssembly>
12-
<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"/>
15-
</dependentAssembly>
16-
<dependentAssembly>
17-
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
18-
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0"/>
19-
</dependentAssembly>
20-
<dependentAssembly>
21-
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
22-
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0"/>
23-
</dependentAssembly>
24-
<dependentAssembly>
25-
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
26-
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0"/>
27-
</dependentAssembly>
28-
<dependentAssembly>
29-
<assemblyIdentity name="Microsoft.ApplicationInsights" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
30-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0"/>
31-
</dependentAssembly>
32-
</assemblyBinding>
33-
</runtime>
346
</configuration>

‎src/ArchivePackages/ArchivePackages.csproj‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,8 @@
3838
<ItemGroup>
3939
<Reference Include="System" />
4040
<Reference Include="System.Core" />
41-
<Reference Include="System.Net" />
42-
<Reference Include="System.Net.Http" />
43-
<Reference Include="System.Net.Http.WebRequest" />
44-
<Reference Include="System.Xml.Linq" />
45-
<Reference Include="System.Data.DataSetExtensions" />
4641
<Reference Include="Microsoft.CSharp" />
4742
<Reference Include="System.Data" />
48-
<Reference Include="System.Xml" />
4943
</ItemGroup>
5044
<ItemGroup>
5145
<Compile Include="ArchivePackages.Job.cs" />
@@ -84,6 +78,9 @@
8478
<PackageReference Include="NuGet.Services.Sql">
8579
<Version>2.25.0-master-30453</Version>
8680
</PackageReference>
81+
<PackageReference Include="System.Net.Http">
82+
<Version>4.3.3</Version>
83+
</PackageReference>
8784
<PackageReference Include="WindowsAzure.Storage">
8885
<Version>7.1.2</Version>
8986
</PackageReference>

‎src/CopyAzureContainer/App.config‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?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.6.2"/>
55
</startup>
6-
<runtime>
7-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8-
<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" />
11-
</dependentAssembly>
12-
<dependentAssembly>
13-
<assemblyIdentity name="Microsoft.ApplicationInsights" publicKeyToken="31bf3856ad364e35" culture="neutral" />
14-
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
15-
</dependentAssembly>
16-
<dependentAssembly>
17-
<assemblyIdentity name="NuGet.Services.KeyVault" publicKeyToken="31bf3856ad364e35" culture="neutral" />
18-
<bindingRedirect oldVersion="0.0.0.0-2.2.3.0" newVersion="2.2.3.0" />
19-
</dependentAssembly>
20-
</assemblyBinding>
21-
</runtime>
22-
</configuration>
6+
</configuration>

‎src/CopyAzureContainer/CopyAzureContainer.csproj‎

Lines changed: 16 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
<OutputType>Exe</OutputType>
99
<RootNamespace>CopyAzureContainer</RootNamespace>
1010
<AssemblyName>CopyAzureContainer</AssemblyName>
11-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14+
<TargetFrameworkProfile />
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -32,38 +33,10 @@
3233
<WarningLevel>4</WarningLevel>
3334
</PropertyGroup>
3435
<ItemGroup>
35-
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
36-
<HintPath>..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
37-
</Reference>
38-
<Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
39-
<HintPath>..\..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll</HintPath>
40-
</Reference>
41-
<Reference Include="Microsoft.Data.OData, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
42-
<HintPath>..\..\packages\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll</HintPath>
43-
</Reference>
44-
<Reference Include="Microsoft.Data.Services.Client, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
45-
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
46-
</Reference>
47-
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
48-
<HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
49-
</Reference>
50-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=8.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51-
<HintPath>..\..\packages\WindowsAzure.Storage.8.1.1\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
52-
</Reference>
53-
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
54-
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
55-
</Reference>
5636
<Reference Include="System" />
5737
<Reference Include="System.Core" />
58-
<Reference Include="System.Spatial, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59-
<HintPath>..\..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll</HintPath>
60-
</Reference>
61-
<Reference Include="System.Xml.Linq" />
62-
<Reference Include="System.Data.DataSetExtensions" />
6338
<Reference Include="Microsoft.CSharp" />
6439
<Reference Include="System.Data" />
65-
<Reference Include="System.Net.Http" />
66-
<Reference Include="System.Xml" />
6740
</ItemGroup>
6841
<ItemGroup>
6942
<Compile Include="AzureContainerInfo.cs" />
@@ -76,7 +49,6 @@
7649
</ItemGroup>
7750
<ItemGroup>
7851
<None Include="App.config" />
79-
<None Include="packages.config" />
8052
<None Include="Scripts\*" />
8153
<None Include="CopyAzureContainer.nuspec" />
8254
</ItemGroup>
@@ -86,7 +58,20 @@
8658
<Name>NuGet.Jobs.Common</Name>
8759
</ProjectReference>
8860
</ItemGroup>
89-
<ItemGroup />
61+
<ItemGroup>
62+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
63+
<Version>1.0.0</Version>
64+
</PackageReference>
65+
<PackageReference Include="System.ComponentModel.EventBasedAsync">
66+
<Version>4.0.11</Version>
67+
</PackageReference>
68+
<PackageReference Include="System.Net.Http">
69+
<Version>4.3.3</Version>
70+
</PackageReference>
71+
<PackageReference Include="WindowsAzure.Storage">
72+
<Version>7.1.2</Version>
73+
</PackageReference>
74+
</ItemGroup>
9075
<ItemGroup>
9176
<Content Include="tools\azcopy\ReadMe.txt" />
9277
</ItemGroup>

‎src/CopyAzureContainer/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,3 @@
1414
[assembly: AssemblyCulture("")]
1515
[assembly: ComVisible(false)]
1616
[assembly: Guid("a07f7d0c-f269-43d5-a812-3abc47090885")]
17-
18-

‎src/CopyAzureContainer/packages.config‎

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

‎src/Gallery.CredentialExpiration/App.config‎

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
5-
</startup>
6-
<runtime>
7-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8-
<dependentAssembly>
9-
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
10-
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0"/>
11-
</dependentAssembly>
12-
<dependentAssembly>
13-
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
14-
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0"/>
15-
</dependentAssembly>
16-
<dependentAssembly>
17-
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
18-
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0"/>
19-
</dependentAssembly>
20-
<dependentAssembly>
21-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
22-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
23-
</dependentAssembly>
24-
<dependentAssembly>
25-
<assemblyIdentity name="Serilog" publicKeyToken="24c2f752a8e58a10" culture="neutral"/>
26-
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0"/>
27-
</dependentAssembly>
28-
<dependentAssembly>
29-
<assemblyIdentity name="Microsoft.ApplicationInsights" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
30-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0"/>
31-
</dependentAssembly>
32-
<dependentAssembly>
33-
<assemblyIdentity name="Microsoft.Azure.KeyVault" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
34-
<bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0"/>
35-
</dependentAssembly>
36-
</assemblyBinding>
37-
</runtime>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
5+
</startup>
386
</configuration>

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,8 @@
3737
<Reference Include="System" />
3838
<Reference Include="System.ComponentModel.Composition" />
3939
<Reference Include="System.Core" />
40-
<Reference Include="System.Xml.Linq" />
41-
<Reference Include="System.Data.DataSetExtensions" />
4240
<Reference Include="Microsoft.CSharp" />
4341
<Reference Include="System.Data" />
44-
<Reference Include="System.Net.Http" />
45-
<Reference Include="System.Xml" />
4642
</ItemGroup>
4743
<ItemGroup>
4844
<Compile Include="GalleryCredentialExpiration.cs" />
@@ -102,6 +98,9 @@
10298
<PackageReference Include="NuGet.Services.Storage">
10399
<Version>2.1.3</Version>
104100
</PackageReference>
101+
<PackageReference Include="System.Net.Http">
102+
<Version>4.3.3</Version>
103+
</PackageReference>
105104
<PackageReference Include="WindowsAzure.Storage">
106105
<Version>7.1.2</Version>
107106
</PackageReference>

0 commit comments

Comments
 (0)