Skip to content

Commit

Permalink
Merge pull request #219 from Dynatrace/latest-and-greatest
Browse files Browse the repository at this point in the history
  • Loading branch information
discostu105 authored Oct 30, 2020
2 parents 643fc14 + e6fe0a9 commit af7f6ee
Show file tree
Hide file tree
Showing 12 changed files with 79 additions and 79 deletions.
2 changes: 1 addition & 1 deletion conf/appsettings.json.template
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
"DownloadServiceRetry": "5", // Number of retries when trying to download a dump file from an URL
"DownloadServiceRetryTimeout": "500", //Time between download retries in milliseconds
"DownloadServiceHttpClientTimeout": "00:04:00",
"UseAmazonSqs": "true",
"UseAmazonSqs": "false",
"AmazonSqsSettings": {
"SuperDumpBaseUrl": "", // Url that is used for generating the response messages
"PollCron": "*/30 * * * *", //Hangfire cron expression which describes the schedule for polling the Aws Queue
Expand Down
4 changes: 2 additions & 2 deletions src/SuperDump.DebugDiag/SuperDump.DebugDiag.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.5.0" />
<PackageReference Include="Dynatrace.OneAgent.Sdk" Version="1.4.0" />
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="Dynatrace.OneAgent.Sdk" Version="1.7.0" />
</ItemGroup>
</Project>
7 changes: 4 additions & 3 deletions src/SuperDump.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.13
# Visual Studio Version 16
VisualStudioVersion = 16.0.30615.102
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "conf", "conf", "{F1C07791-3C2A-400E-8505-87F0AA3D21EC}"
ProjectSection(SolutionItems) = preProject
Expand Down Expand Up @@ -45,7 +45,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SuperDumpService.Test.Fakes
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
SuperDump.Analyzer.Common\SuperDump.Analyzer.Common.projitems*{0dd4da67-4e55-4ee1-9030-5a69d8cdc6b4}*SharedItemsImports = 4
SuperDump.Analyzer.Common\SuperDump.Analyzer.Common.projitems*{0dd4da67-4e55-4ee1-9030-5a69d8cdc6b4}*SharedItemsImports = 5
SuperDump.Analyzer.Common\SuperDump.Analyzer.Common.projitems*{2630fb6a-4a60-4330-895f-7665045fed6f}*SharedItemsImports = 5
SuperDump.Analyzer.Common\SuperDump.Analyzer.Common.projitems*{ea333d99-767a-472b-a272-b44c659023c0}*SharedItemsImports = 13
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
30 changes: 15 additions & 15 deletions src/SuperDump/SuperDump.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net48</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<RuntimeIdentifier>win-x86 or win-x64</RuntimeIdentifier>
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
<OutputPath>bin\$(Platform)</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
Expand Down Expand Up @@ -48,43 +48,43 @@
<ProjectReference Include="..\SuperDumpModels\SuperDumpModels.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ByteSize" Version="1.3.0" />
<PackageReference Include="CommandLineParser" Version="2.5.0" />
<PackageReference Include="Dynatrace.OneAgent.Sdk" Version="1.4.0" />
<PackageReference Include="LargeAddressAware" Version="1.0.3" />
<PackageReference Include="Microsoft.Diagnostics.Runtime" Version="1.0.3" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.2.0-preview2-26905-02" />
<PackageReference Include="morelinq" Version="3.0.0" />
<PackageReference Include="ByteSize" Version="2.0.0" />
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="Dynatrace.OneAgent.Sdk" Version="1.7.0" />
<PackageReference Include="LargeAddressAware" Version="1.0.5" />
<PackageReference Include="Microsoft.Diagnostics.Runtime" Version="1.1.142101" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="5.0.0-rc.2.20475.5" />
<PackageReference Include="morelinq" Version="3.3.2" />
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="System.Collections" Version="4.3.0" />
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
<PackageReference Include="System.Console" Version="4.3.1" />
<PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.5.1" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.0-rc.2.20475.5" />
<PackageReference Include="System.Diagnostics.Tools" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.Tracing" Version="4.3.0" />
<PackageReference Include="System.Globalization" Version="4.3.0" />
<PackageReference Include="System.IO" Version="4.3.0" />
<PackageReference Include="System.Linq" Version="4.3.0" />
<PackageReference Include="System.Linq.Expressions" Version="4.3.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Net.Primitives" Version="4.3.0" />
<PackageReference Include="System.Net.Primitives" Version="4.3.1" />
<PackageReference Include="System.ObjectModel" Version="4.3.0" />
<PackageReference Include="System.Reflection" Version="4.3.0" />
<PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
<PackageReference Include="System.Reflection.Primitives" Version="4.3.0" />
<PackageReference Include="System.Resources.ResourceManager" Version="4.3.0" />
<PackageReference Include="System.Runtime" Version="4.3.0" />
<PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
<PackageReference Include="System.Runtime" Version="4.3.1" />
<PackageReference Include="System.Runtime.Extensions" Version="4.3.1" />
<PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
<PackageReference Include="System.Runtime.Numerics" Version="4.3.0" />
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
<PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
<PackageReference Include="System.Text.Encoding" Version="4.3.0" />
<PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.0" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageReference Include="System.Threading" Version="4.3.0" />
<PackageReference Include="System.Threading.Tasks" Version="4.3.0" />
<PackageReference Include="System.Threading.Timer" Version="4.3.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/SuperDumpModels/SuperDumpModels.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions src/SuperDumpSelector/SuperDumpSelector.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<ProjectReference Include="..\SuperDump.Common\SuperDump.Common.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.5.0" />
<PackageReference Include="Dynatrace.OneAgent.Sdk" Version="1.4.0" />
<PackageReference Include="Microsoft.Diagnostics.Runtime" Version="1.0.5" />
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="Dynatrace.OneAgent.Sdk" Version="1.7.0" />
<PackageReference Include="Microsoft.Diagnostics.Runtime" Version="1.1.142101" />
<PackageReference Include="System.Console" Version="4.3.1" />
<PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
<PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<LangVersion>7.2</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/SuperDumpService.Test/SuperDumpService.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
10 changes: 5 additions & 5 deletions src/SuperDumpService/Services/SlackNotificationService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ public async Task NotifyDumpAnalysisFinished(DumpMetainfo dumpInfo) {
}

public async Task<string> GetMessage(DumpMetainfo dumpInfo) {
//var engine = new RazorLightEngineBuilder()
//.UseEmbeddedResourcesProject(typeof(SlackMessageViewModel))
//.UseMemoryCachingProvider()
//.Build();
var engine = new EngineFactory().ForEmbeddedResources(typeof(SlackMessageViewModel));
var engine = new RazorLightEngineBuilder()
.UseEmbeddedResourcesProject(typeof(SlackMessageViewModel))
.UseMemoryCachingProvider()
.Build();
//var engine = new EngineFactory().ForEmbeddedResources(typeof(SlackMessageViewModel));
return await engine.CompileRenderAsync("SlackMessage", await GetMessageModel(dumpInfo));
}

Expand Down
45 changes: 22 additions & 23 deletions src/SuperDumpService/SuperDumpService.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<RestorePackages>true</RestorePackages>
<MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish> <!-- needed for RazorLight. see https://github.com/toddams/RazorLight/issues/118 -->
<UserSecretsId>B58C48DC-CC1B-4647-8E53-36B41078F1B8</UserSecretsId>
<LangVersion>7.2</LangVersion>
</PropertyGroup>
<ItemGroup>
<Content Remove="Views\SlackMessage.cshtml" />
Expand All @@ -23,38 +22,38 @@
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.3.103.71" />
<PackageReference Include="AWSSDK.SQS" Version="3.3.102.38" />
<PackageReference Include="Dynatrace.OneAgent.Sdk" Version="1.6.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.0.0" /><!-- required since the update to .net core 3.0 because of a missing dependency -->
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="3.0.0" />
<PackageReference Include="AWSSDK.Core" Version="3.5.1.32" />
<PackageReference Include="AWSSDK.SQS" Version="3.5.0.34" />
<PackageReference Include="Dynatrace.OneAgent.Sdk" Version="1.7.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.0-rc.2.20475.17" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="5.0.0-rc.2.20475.17" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0-rc.2.20475.5" /><!-- required since the update to .net core 3.0 because of a missing dependency -->
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="5.0.0-rc.2.20478.4" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
<PackageReference Include="ByteSize" Version="2.0.0-beta1" />
<PackageReference Include="Hangfire" Version="1.7.6" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.7.6" />
<PackageReference Include="ByteSize" Version="2.0.0" />
<PackageReference Include="Hangfire" Version="1.7.17" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.7.17" />
<PackageReference Include="Hangfire.MemoryStorage.Core" Version="1.4.0" />
<PackageReference Include="Humanizer" Version="2.7.2" />
<PackageReference Include="Humanizer" Version="2.8.26" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink.Loader" Version="14.1.0" />
<!--<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.0" /> ___ what do we need this for? it has a version clash with BenchmarkDotnet. can we remove it? -->
<PackageReference Include="NEST" Version="7.3.0" />
<PackageReference Include="RazorLight" Version="2.0.0-beta1" />
<PackageReference Include="Serilog" Version="2.9.0-dev-01091" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.0-dev-10240" />
<PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0-dev-00032" />
<PackageReference Include="SharpZipLib" Version="1.2.0" />
<PackageReference Include="NEST" Version="7.9.0" />
<PackageReference Include="RazorLight" Version="2.0.0-beta9" />
<PackageReference Include="Serilog" Version="2.10.1-dev-01249" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.2-dev-10281" />
<PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0" />
<PackageReference Include="SharpZipLib" Version="1.3.0" />
<PackageReference Include="Slack.Webhooks.Core" Version="1.0.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc3" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.0.0-rc3" />
<PackageReference Include="System.DirectoryServices.AccountManagement" Version="4.6.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.6.3" />
<PackageReference Include="System.DirectoryServices.AccountManagement" Version="5.0.0-rc.2.20475.5" />
<PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Net.Http.Formatting.Extension" Version="5.2.3" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" /> <!-- needed to reference this directly because of a "package downgrade problem" introduced by "Slack.Webhooks.Core" -->
<PackageReference Include="WebSocketManager" Version="1.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.0.0" />
<PackageReference Include="X.PagedList.Mvc.Core" Version="7.9.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.0-rc.2.20475.17" />
<PackageReference Include="X.PagedList.Mvc.Core" Version="8.0.7" />
</ItemGroup>
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
<Exec Command="bower install" />
Expand Down
37 changes: 19 additions & 18 deletions src/SuperDumpService/web.config
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<!--
<!--
Configure your application settings in appsettings.json. Learn more at http://go.microsoft.com/fwlink/?LinkId=786380
-->
<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
</handlers>
<aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="true" stdoutLogFile="..\..\logs\stdout" forwardWindowsAuthToken="false">
<environmentVariables>
<environmentVariable name="ASPNETCORE_ENVIRONMENT" value="Development" />
<environmentVariable name="ASPNETCORE_HTTPS_PORT" value="44379" />
</environmentVariables>
</aspNetCore>
<security>
<requestFiltering>
<!-- set max allowed request content length to 4GB - 1byte (IIS does not allow a value >= 4GB) -->
<requestLimits maxAllowedContentLength="4294967295" />
</requestFiltering>
</security>
</system.webServer>
<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
</handlers>
<aspNetCore processPath="%LAUNCHER_PATH%" stdoutLogEnabled="true" stdoutLogFile="..\..\logs\stdout" forwardWindowsAuthToken="false" hostingModel="InProcess">
<environmentVariables>
<environmentVariable name="ASPNETCORE_ENVIRONMENT" value="Development" />
<environmentVariable name="ASPNETCORE_HTTPS_PORT" value="44379" />
<environmentVariable name="COMPLUS_ForceENC" value="1" />
</environmentVariables>
</aspNetCore>
<security>
<requestFiltering>
<!-- set max allowed request content length to 4GB - 1byte (IIS does not allow a value >= 4GB) -->
<requestLimits maxAllowedContentLength="4294967295" />
</requestFiltering>
</security>
</system.webServer>
</configuration>
8 changes: 4 additions & 4 deletions src/SuperDumpTests/SuperDumpTests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net48</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<AssemblyName>SuperDumpTests</AssemblyName>
<OutputPath>bin\$(Configuration)</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
Expand All @@ -18,8 +18,8 @@
<ProjectReference Include="..\SuperDump\SuperDump.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
<PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
</ItemGroup>
</Project>

0 comments on commit af7f6ee

Please sign in to comment.