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

Commit f6ed450

Browse files
author
Christy Henriksson
authored
SQL auto rotation: Stats.ImportAzureCdnStatistics (#427)
1 parent 057ee62 commit f6ed450

31 files changed

Lines changed: 167 additions & 778 deletions

File tree

src/Stats.CollectAzureCdnLogs/References/ICSharpCode.SharpZipLib.0.86.0/ICSharpCode.SharpZipLib.dll renamed to external/ICSharpCode.SharpZipLib.0.86.0/ICSharpCode.SharpZipLib.dll

File renamed without changes.

src/Stats.CollectAzureCdnLogs/References/ICSharpCode.SharpZipLib.0.86.0/license.md renamed to external/ICSharpCode.SharpZipLib.0.86.0/license.md

File renamed without changes.

src/Stats.CollectAzureCdnLogs/References/Readme.txt renamed to external/Readme.txt

File renamed without changes.

‎src/Stats.AzureCdnLogs.Common/Stats.AzureCdnLogs.Common.csproj‎

Lines changed: 15 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,6 +11,7 @@
1111
<AssemblyName>Stats.AzureCdnLogs.Common</AssemblyName>
1212
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1415
<TargetFrameworkProfile />
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -31,38 +32,14 @@
3132
<WarningLevel>4</WarningLevel>
3233
</PropertyGroup>
3334
<ItemGroup>
34-
<Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
35-
<HintPath>..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
36-
</Reference>
37-
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
38-
<HintPath>..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
39-
</Reference>
40-
<Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
41-
<HintPath>..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
42-
</Reference>
43-
<Reference Include="Microsoft.Data.OData, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
44-
<HintPath>..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
45-
</Reference>
46-
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47-
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
48-
</Reference>
49-
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
50-
<HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
51-
</Reference>
52-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=7.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53-
<HintPath>..\..\packages\WindowsAzure.Storage.7.1.2\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
54-
</Reference>
55-
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
56-
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
35+
<Reference Include="ICSharpCode.SharpZipLib">
36+
<HintPath>$(MSBuildProjectDirectory)\..\..\external\ICSharpCode.SharpZipLib.0.86.0\ICSharpCode.SharpZipLib.dll</HintPath>
5737
</Reference>
5838
<Reference Include="System" />
5939
<Reference Include="System.Core" />
6040
<Reference Include="Microsoft.CSharp" />
6141
<Reference Include="System.Data" />
6242
<Reference Include="System.Runtime.Serialization" />
63-
<Reference Include="System.Spatial, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<HintPath>..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
65-
</Reference>
6643
<Reference Include="System.Web" />
6744
<Reference Include="System.Xml" />
6845
</ItemGroup>
@@ -100,22 +77,24 @@
10077
</ItemGroup>
10178
<ItemGroup>
10279
<None Include="app.config" />
103-
<None Include="packages.config" />
10480
</ItemGroup>
10581
<ItemGroup>
10682
<EmbeddedResource Include="LogMessages.resx">
10783
<Generator>PublicResXFileCodeGenerator</Generator>
10884
<LastGenOutput>LogMessages.Designer.cs</LastGenOutput>
10985
</EmbeddedResource>
11086
</ItemGroup>
111-
<ItemGroup />
87+
<ItemGroup>
88+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
89+
<Version>1.0.0</Version>
90+
</PackageReference>
91+
<PackageReference Include="Newtonsoft.Json">
92+
<Version>9.0.1</Version>
93+
</PackageReference>
94+
<PackageReference Include="WindowsAzure.Storage">
95+
<Version>7.1.2</Version>
96+
</PackageReference>
97+
</ItemGroup>
11298
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
11399
<Import Project="..\..\build\sign.targets" Condition="Exists('..\..\build\sign.targets')" />
114-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
115-
Other similar extension points exist, see Microsoft.Common.targets.
116-
<Target Name="BeforeBuild">
117-
</Target>
118-
<Target Name="AfterBuild">
119-
</Target>
120-
-->
121100
</Project>

‎src/Stats.AzureCdnLogs.Common/packages.config‎

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

‎src/Stats.CollectAzureCdnLogs/Stats.CollectAzureCdnLogs.csproj‎

Lines changed: 20 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,6 +11,7 @@
1111
<AssemblyName>Stats.CollectAzureCdnLogs</AssemblyName>
1212
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1415
<TargetFrameworkProfile />
1516
<NuGetPackageImportStamp>
1617
</NuGetPackageImportStamp>
@@ -39,40 +40,7 @@
3940
</PropertyGroup>
4041
<ItemGroup>
4142
<Reference Include="ICSharpCode.SharpZipLib">
42-
<HintPath>References\ICSharpCode.SharpZipLib.0.86.0\ICSharpCode.SharpZipLib.dll</HintPath>
43-
</Reference>
44-
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
45-
<HintPath>..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
46-
</Reference>
47-
<Reference Include="Microsoft.Data.Edm, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48-
<HintPath>..\..\packages\Microsoft.Data.Edm.5.7.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
49-
</Reference>
50-
<Reference Include="Microsoft.Data.OData, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51-
<HintPath>..\..\packages\Microsoft.Data.OData.5.7.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
52-
</Reference>
53-
<Reference Include="Microsoft.Data.Services.Client, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
54-
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.7.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
55-
</Reference>
56-
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
57-
<HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
58-
</Reference>
59-
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
60-
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
61-
</Reference>
62-
<Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
63-
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
64-
</Reference>
65-
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
66-
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
67-
</Reference>
68-
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69-
<HintPath>..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.1\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
70-
</Reference>
71-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=7.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72-
<HintPath>..\..\packages\WindowsAzure.Storage.7.1.2\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
73-
</Reference>
74-
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
75-
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
43+
<HintPath>$(MSBuildProjectDirectory)\..\..\external\ICSharpCode.SharpZipLib.0.86.0\ICSharpCode.SharpZipLib.dll</HintPath>
7644
</Reference>
7745
<Reference Include="System" />
7846
<Reference Include="System.ComponentModel.Composition" />
@@ -81,16 +49,7 @@
8149
<Reference Include="System.Data" />
8250
<Reference Include="System.Net" />
8351
<Reference Include="System.Net.Http" />
84-
<Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
85-
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
86-
</Reference>
87-
<Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
88-
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
89-
</Reference>
9052
<Reference Include="System.Net.Http.WebRequest" />
91-
<Reference Include="System.Spatial, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
92-
<HintPath>..\..\packages\System.Spatial.5.7.0\lib\net40\System.Spatial.dll</HintPath>
93-
</Reference>
9453
</ItemGroup>
9554
<ItemGroup>
9655
<Compile Include="Blob\CloudBlobRawLogClient.cs" />
@@ -114,7 +73,6 @@
11473
<None Include="App.config">
11574
<SubType>Designer</SubType>
11675
</None>
117-
<None Include="packages.config" />
11876
<None Include="Scripts\*" />
11977
<None Include="Stats.CollectAzureCdnLogs.nuspec" />
12078
</ItemGroup>
@@ -134,20 +92,23 @@
13492
<LastGenOutput>LogMessages.Designer.cs</LastGenOutput>
13593
</EmbeddedResource>
13694
</ItemGroup>
95+
<ItemGroup>
96+
<PackageReference Include="Microsoft.Data.Edm">
97+
<Version>5.7.0</Version>
98+
</PackageReference>
99+
<PackageReference Include="Microsoft.Data.OData">
100+
<Version>5.7.0</Version>
101+
</PackageReference>
102+
<PackageReference Include="Microsoft.Data.Services.Client">
103+
<Version>5.7.0</Version>
104+
</PackageReference>
105+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
106+
<Version>1.0.0</Version>
107+
</PackageReference>
108+
<PackageReference Include="WindowsAzure.Storage">
109+
<Version>7.1.2</Version>
110+
</PackageReference>
111+
</ItemGroup>
137112
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
138113
<Import Project="..\..\build\sign.targets" Condition="Exists('..\..\build\sign.targets')" />
139-
<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')" />
140-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
141-
<PropertyGroup>
142-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
143-
</PropertyGroup>
144-
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
145-
</Target>
146-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
147-
Other similar extension points exist, see Microsoft.Common.targets.
148-
<Target Name="BeforeBuild">
149-
</Target>
150-
<Target Name="AfterBuild">
151-
</Target>
152-
-->
153114
</Project>

‎src/Stats.CollectAzureCdnLogs/packages.config‎

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

‎src/Stats.CollectAzureChinaCDNLogs/App.config‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
</startup>
66
<runtime>
77
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8-
9-
<dependentAssembly>
10-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
12-
</dependentAssembly>
138
<dependentAssembly>
149
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
1510
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />

‎src/Stats.CollectAzureChinaCDNLogs/References/ICSharpCode.SharpZipLib.0.86.0/ICSharpCode.SharpZipLib.dll‎

-196 KB
Binary file not shown.

‎src/Stats.CollectAzureChinaCDNLogs/References/ICSharpCode.SharpZipLib.0.86.0/license.md‎

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

0 commit comments

Comments
 (0)