From 1aee59e626211e5c964893ec9be5b64a76a84f66 Mon Sep 17 00:00:00 2001 From: Blake Niemyjski Date: Tue, 10 May 2022 08:41:50 -0500 Subject: [PATCH 1/3] Upgrade packages to .NET 6, .NET 5 is EOL --- .github/workflows/build-linux.yml | 4 ++-- .github/workflows/build-osx.yml | 4 ++-- .github/workflows/build-windows.yml | 4 ++-- .vscode/launch.json | 4 ++-- Exceptionless.Net.Windows.sln | 6 +++--- build/common.props | 2 +- global.json | 2 +- .../Exceptionless.SampleAspNetCore.csproj | 2 +- .../Exceptionless.SampleConsole.csproj | 4 ++-- .../Exceptionless.SampleHosting.csproj | 2 +- .../Exceptionless.SampleLambda.csproj | 6 +++--- .../aws-lambda-tools-defaults.json | 4 ++-- .../Exceptionless.SampleLambdaAspNetCore.csproj | 2 +- .../aws-lambda-tools-defaults.json | 4 ++-- samples/Exceptionless.SampleWcf/Web.config | 4 ++-- samples/Exceptionless.SampleWeb/Web.config | 4 ++-- .../Exceptionless.SampleWindows.csproj | 4 ++-- .../Exceptionless.SampleWpf.csproj | 4 ++-- .../Exceptionless.MessagePack.csproj | 2 +- .../Exceptionless.Windows.csproj | 4 ++-- .../Exceptionless.Wpf/Exceptionless.Wpf.csproj | 4 ++-- .../Exceptionless.MessagePack.Tests.csproj | 6 +++--- .../Exceptionless.Tests/Exceptionless.Tests.csproj | 6 +++--- .../Plugins/020_ErrorPluginTests.cs | 14 +++++++++----- test/Exceptionless.Tests/Plugins/PluginTestBase.cs | 13 ------------- .../Utility/PasswordGenerator.cs | 2 +- 26 files changed, 54 insertions(+), 63 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 37c7fae7..8f848973 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -13,13 +13,13 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 5.x + dotnet-version: 6.x - name: Build Reason run: "echo ref: ${{github.ref}} event: ${{github.event_name}}" - name: Build Version shell: bash run: | - dotnet tool install --global minver-cli --version 2.5.0 + dotnet tool install --global minver-cli --version 3.1.0 version=$(minver --tag-prefix v) echo "MINVERVERSIONOVERRIDE=$version" >> $GITHUB_ENV - name: Build diff --git a/.github/workflows/build-osx.yml b/.github/workflows/build-osx.yml index 40d2b37e..8cffa2b5 100644 --- a/.github/workflows/build-osx.yml +++ b/.github/workflows/build-osx.yml @@ -13,13 +13,13 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 5.x + dotnet-version: 6.x - name: Build Reason run: "echo ref: ${{github.ref}} event: ${{github.event_name}}" - name: Build Version shell: bash run: | - dotnet tool install --global minver-cli --version 2.5.0 + dotnet tool install --global minver-cli --version 3.1.0 version=$(minver --tag-prefix v) echo "MINVERVERSIONOVERRIDE=$version" >> $GITHUB_ENV - name: Build diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 22e39d43..945ed1e1 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -13,13 +13,13 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 5.x + dotnet-version: 6.x - name: Build Reason run: "echo ref: ${{github.ref}} event: ${{github.event_name}}" - name: Build Version shell: bash run: | - dotnet tool install --global minver-cli --version 2.5.0 + dotnet tool install --global minver-cli --version 3.1.0 version=$(minver --tag-prefix v) echo "MINVERVERSIONOVERRIDE=$version" >> $GITHUB_ENV - name: Build diff --git a/.vscode/launch.json b/.vscode/launch.json index ca5c0595..b06bb7b8 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,7 +6,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "Build", - "program": "${workspaceRoot}/samples/Exceptionless.SampleConsole/bin/Debug/net5.0/Exceptionless.SampleConsole.dll", + "program": "${workspaceRoot}/samples/Exceptionless.SampleConsole/bin/Debug/net6.0/Exceptionless.SampleConsole.dll", "args": [], "cwd": "${workspaceRoot}/samples/Exceptionless.SampleConsole", "stopAtEntry": false, @@ -20,7 +20,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "Build", - "program": "${workspaceRoot}/samples/Exceptionless.SampleAspNetCore/bin/Debug/net5.0/Exceptionless.SampleAspNetCore.dll", + "program": "${workspaceRoot}/samples/Exceptionless.SampleAspNetCore/bin/Debug/net6.0/Exceptionless.SampleAspNetCore.dll", "args": [], "cwd": "${workspaceRoot}/samples/Exceptionless.SampleAspNetCore", "stopAtEntry": false, diff --git a/Exceptionless.Net.Windows.sln b/Exceptionless.Net.Windows.sln index 61c0e719..0761f444 100644 --- a/Exceptionless.Net.Windows.sln +++ b/Exceptionless.Net.Windows.sln @@ -1,7 +1,7 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.152 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{728C18BC-4085-4492-B0B2-8211CA209A50}" ProjectSection(SolutionItems) = preProject diff --git a/build/common.props b/build/common.props index ed5c5e18..ffc3a1e4 100644 --- a/build/common.props +++ b/build/common.props @@ -42,7 +42,7 @@ - + diff --git a/global.json b/global.json index 2c4c4502..8a4df072 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "5.0.100", + "version": "6.0.202", "rollForward": "latestMinor" } } \ No newline at end of file diff --git a/samples/Exceptionless.SampleAspNetCore/Exceptionless.SampleAspNetCore.csproj b/samples/Exceptionless.SampleAspNetCore/Exceptionless.SampleAspNetCore.csproj index cd78f586..b19989b9 100644 --- a/samples/Exceptionless.SampleAspNetCore/Exceptionless.SampleAspNetCore.csproj +++ b/samples/Exceptionless.SampleAspNetCore/Exceptionless.SampleAspNetCore.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 diff --git a/samples/Exceptionless.SampleConsole/Exceptionless.SampleConsole.csproj b/samples/Exceptionless.SampleConsole/Exceptionless.SampleConsole.csproj index 205378ca..0aba3c5e 100644 --- a/samples/Exceptionless.SampleConsole/Exceptionless.SampleConsole.csproj +++ b/samples/Exceptionless.SampleConsole/Exceptionless.SampleConsole.csproj @@ -1,7 +1,7 @@ - + - net5.0 + net6.0 Exceptionless.SampleConsole Exe $(DefineConstants);NETSTANDARD;NETSTANDARD2_0 diff --git a/samples/Exceptionless.SampleHosting/Exceptionless.SampleHosting.csproj b/samples/Exceptionless.SampleHosting/Exceptionless.SampleHosting.csproj index 2f64568a..2bd7f2d4 100644 --- a/samples/Exceptionless.SampleHosting/Exceptionless.SampleHosting.csproj +++ b/samples/Exceptionless.SampleHosting/Exceptionless.SampleHosting.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 diff --git a/samples/Exceptionless.SampleLambda/Exceptionless.SampleLambda.csproj b/samples/Exceptionless.SampleLambda/Exceptionless.SampleLambda.csproj index 95037366..4053dd2a 100644 --- a/samples/Exceptionless.SampleLambda/Exceptionless.SampleLambda.csproj +++ b/samples/Exceptionless.SampleLambda/Exceptionless.SampleLambda.csproj @@ -1,6 +1,6 @@ - net5.0 + net6.0 true latest Lambda @@ -9,8 +9,8 @@ true - - + + diff --git a/samples/Exceptionless.SampleLambda/aws-lambda-tools-defaults.json b/samples/Exceptionless.SampleLambda/aws-lambda-tools-defaults.json index 9028135f..1e8d55d1 100644 --- a/samples/Exceptionless.SampleLambda/aws-lambda-tools-defaults.json +++ b/samples/Exceptionless.SampleLambda/aws-lambda-tools-defaults.json @@ -8,8 +8,8 @@ "profile": "", "region": "", "configuration": "Release", - "framework": "net5.0", - "function-runtime": "dotnetcore3.1", + "framework": "net6.0", + "function-runtime": "dotnet6", "function-memory-size": 256, "function-timeout": 30, "function-handler": "Exceptionless.SampleLambda::Exceptionless.SampleLambda.Function::FunctionHandler" diff --git a/samples/Exceptionless.SampleLambdaAspNetCore/Exceptionless.SampleLambdaAspNetCore.csproj b/samples/Exceptionless.SampleLambdaAspNetCore/Exceptionless.SampleLambdaAspNetCore.csproj index e2eb7de6..1337d25f 100644 --- a/samples/Exceptionless.SampleLambdaAspNetCore/Exceptionless.SampleLambdaAspNetCore.csproj +++ b/samples/Exceptionless.SampleLambdaAspNetCore/Exceptionless.SampleLambdaAspNetCore.csproj @@ -1,6 +1,6 @@ - net5.0 + net6.0 true Lambda diff --git a/samples/Exceptionless.SampleLambdaAspNetCore/aws-lambda-tools-defaults.json b/samples/Exceptionless.SampleLambdaAspNetCore/aws-lambda-tools-defaults.json index 24f90651..1d6ec8a4 100644 --- a/samples/Exceptionless.SampleLambdaAspNetCore/aws-lambda-tools-defaults.json +++ b/samples/Exceptionless.SampleLambdaAspNetCore/aws-lambda-tools-defaults.json @@ -8,8 +8,8 @@ "profile": "", "region": "", "configuration": "Release", - "framework": "net5.0", - "function-runtime": "dotnetcore3.1", + "framework": "net6.0", + "function-runtime": "dotnet6", "function-memory-size": 256, "function-timeout": 30, "function-handler": "Exceptionless.SampleLambdaAspNetCore::Exceptionless.SampleLambdaAspNetCore.LambdaEntryPoint::FunctionHandlerAsync", diff --git a/samples/Exceptionless.SampleWcf/Web.config b/samples/Exceptionless.SampleWcf/Web.config index a5f2cbb3..d6d32a0e 100644 --- a/samples/Exceptionless.SampleWcf/Web.config +++ b/samples/Exceptionless.SampleWcf/Web.config @@ -1,4 +1,4 @@ - +
@@ -11,7 +11,7 @@ - + diff --git a/samples/Exceptionless.SampleWeb/Web.config b/samples/Exceptionless.SampleWeb/Web.config index f1de9fe7..7a446b5d 100644 --- a/samples/Exceptionless.SampleWeb/Web.config +++ b/samples/Exceptionless.SampleWeb/Web.config @@ -4,7 +4,7 @@
- @@ -45,7 +45,7 @@ - + diff --git a/samples/Exceptionless.SampleWindows/Exceptionless.SampleWindows.csproj b/samples/Exceptionless.SampleWindows/Exceptionless.SampleWindows.csproj index 3df9e828..77aa8017 100644 --- a/samples/Exceptionless.SampleWindows/Exceptionless.SampleWindows.csproj +++ b/samples/Exceptionless.SampleWindows/Exceptionless.SampleWindows.csproj @@ -1,6 +1,6 @@  - net5.0-windows;net462 + net6.0-windows;net462 @@ -10,7 +10,7 @@ true - + $(DefineConstants);NETSTANDARD;NETSTANDARD2_0 diff --git a/samples/Exceptionless.SampleWpf/Exceptionless.SampleWpf.csproj b/samples/Exceptionless.SampleWpf/Exceptionless.SampleWpf.csproj index 3e6acb3e..d07e002b 100644 --- a/samples/Exceptionless.SampleWpf/Exceptionless.SampleWpf.csproj +++ b/samples/Exceptionless.SampleWpf/Exceptionless.SampleWpf.csproj @@ -1,7 +1,7 @@  - net5.0-windows;net462 + net6.0-windows;net462 @@ -10,7 +10,7 @@ Exceptionless - + $(DefineConstants);NETSTANDARD;NETSTANDARD2_0 diff --git a/src/Platforms/Exceptionless.MessagePack/Exceptionless.MessagePack.csproj b/src/Platforms/Exceptionless.MessagePack/Exceptionless.MessagePack.csproj index 4beb08a3..9947ce2f 100644 --- a/src/Platforms/Exceptionless.MessagePack/Exceptionless.MessagePack.csproj +++ b/src/Platforms/Exceptionless.MessagePack/Exceptionless.MessagePack.csproj @@ -5,7 +5,7 @@ netstandard2.0 - netstandard2.0;net5.0 + netstandard2.0;net6.0 diff --git a/src/Platforms/Exceptionless.Windows/Exceptionless.Windows.csproj b/src/Platforms/Exceptionless.Windows/Exceptionless.Windows.csproj index 27fe2887..c7e810d1 100644 --- a/src/Platforms/Exceptionless.Windows/Exceptionless.Windows.csproj +++ b/src/Platforms/Exceptionless.Windows/Exceptionless.Windows.csproj @@ -2,7 +2,7 @@ - net5.0-windows;net462 + net6.0-windows;net462 @@ -32,7 +32,7 @@ - + $(DefineConstants);NETSTANDARD;NETSTANDARD2_0 diff --git a/src/Platforms/Exceptionless.Wpf/Exceptionless.Wpf.csproj b/src/Platforms/Exceptionless.Wpf/Exceptionless.Wpf.csproj index 08d7c32d..a7aa5fca 100644 --- a/src/Platforms/Exceptionless.Wpf/Exceptionless.Wpf.csproj +++ b/src/Platforms/Exceptionless.Wpf/Exceptionless.Wpf.csproj @@ -2,7 +2,7 @@ - net5.0-windows;net462 + net6.0-windows;net462 @@ -32,7 +32,7 @@ - + $(DefineConstants);NETSTANDARD;NETSTANDARD2_0 diff --git a/test/Exceptionless.MessagePack.Tests/Exceptionless.MessagePack.Tests.csproj b/test/Exceptionless.MessagePack.Tests/Exceptionless.MessagePack.Tests.csproj index ed7dd28b..24f5953a 100644 --- a/test/Exceptionless.MessagePack.Tests/Exceptionless.MessagePack.Tests.csproj +++ b/test/Exceptionless.MessagePack.Tests/Exceptionless.MessagePack.Tests.csproj @@ -2,10 +2,10 @@ - net5.0 + net6.0 - net5.0;net462 + net6.0;net462 @@ -30,7 +30,7 @@ - + $(DefineConstants);NETSTANDARD;NETSTANDARD2_0 diff --git a/test/Exceptionless.Tests/Exceptionless.Tests.csproj b/test/Exceptionless.Tests/Exceptionless.Tests.csproj index ddcbb93e..ca57cb4f 100644 --- a/test/Exceptionless.Tests/Exceptionless.Tests.csproj +++ b/test/Exceptionless.Tests/Exceptionless.Tests.csproj @@ -2,10 +2,10 @@ - net5.0 + net6.0 - net5.0;net462 + net6.0;net462 @@ -19,7 +19,7 @@ - + $(DefineConstants);NETSTANDARD;NETSTANDARD2_0 diff --git a/test/Exceptionless.Tests/Plugins/020_ErrorPluginTests.cs b/test/Exceptionless.Tests/Plugins/020_ErrorPluginTests.cs index 44d00533..a453e75a 100644 --- a/test/Exceptionless.Tests/Plugins/020_ErrorPluginTests.cs +++ b/test/Exceptionless.Tests/Plugins/020_ErrorPluginTests.cs @@ -288,19 +288,23 @@ public void WillUnwrapExceptionTypeName() { } [Fact] - public void TrackException() { + public void VerifyExceptionHResultIsMappedToErrorCode() { var plugin = new ErrorPlugin(); var client = CreateClient(); var context = new EventPluginContext(client, new Event()); - var exception = new TestOutOfMemoryException("Test"); + var exception = new OutOfMemoryException("Test"); context.ContextData.SetException(exception); + plugin.Run(context); + Assert.False(context.Cancel); Assert.Equal(Event.KnownTypes.Error, context.Event.Type); + var error = context.Event.GetError(); - if (error != null) { - Assert.Equal(E_OUTOFMEMORY.ToString(), error.Code); - } + Assert.NotNull(error); + + // + Assert.Equal(unchecked((int)0x8007000E).ToString(), error.Code); } } } \ No newline at end of file diff --git a/test/Exceptionless.Tests/Plugins/PluginTestBase.cs b/test/Exceptionless.Tests/Plugins/PluginTestBase.cs index 599645be..c8a87041 100644 --- a/test/Exceptionless.Tests/Plugins/PluginTestBase.cs +++ b/test/Exceptionless.Tests/Plugins/PluginTestBase.cs @@ -90,18 +90,5 @@ public enum ErrorCategory { FirstErrorBucket, SecondErrorBucket, } - - /// - /// Hresult for 'Failed to allocate necessary memory'. - /// - /// - public const int E_OUTOFMEMORY = unchecked((int)0x8007000E); - - public class TestOutOfMemoryException : Exception { - public TestOutOfMemoryException(string message) : base(message) { - // Out of Memory Exception - HResult = E_OUTOFMEMORY; - } - } } } \ No newline at end of file diff --git a/test/Exceptionless.Tests/Utility/PasswordGenerator.cs b/test/Exceptionless.Tests/Utility/PasswordGenerator.cs index e9f5427d..c8f020cc 100644 --- a/test/Exceptionless.Tests/Utility/PasswordGenerator.cs +++ b/test/Exceptionless.Tests/Utility/PasswordGenerator.cs @@ -57,7 +57,7 @@ public string Next() string allowedChars = AllowedAlphaNumericCharacters + AllowedSpecialCharacters; byte[] data = new byte[Length]; char[] password = new char[Length]; - new RNGCryptoServiceProvider().GetBytes(data); + RandomNumberGenerator.Create().GetBytes(data); int nonAlphanumericCharacters = 0; From c2c74015ce0c82fb60279ccfcab27c168e0cf486 Mon Sep 17 00:00:00 2001 From: Blake Niemyjski Date: Mon, 23 May 2022 06:39:10 -0500 Subject: [PATCH 2/3] Updated deps --- .github/workflows/build-linux.yml | 2 +- .github/workflows/build-osx.yml | 2 +- .github/workflows/build-windows.yml | 2 +- build/common.props | 4 +- .../Exceptionless.SampleConsole.csproj | 2 +- ...xceptionless.SampleLambdaAspNetCore.csproj | 4 +- .../Exceptionless.SampleMvc.csproj | 99 +- .../Scripts/jquery-3.4.1.min.js | 2 - .../Scripts/jquery-3.4.1.min.map | 1 - .../Scripts/jquery-3.4.1.slim.min.js | 2 - .../Scripts/jquery-3.4.1.slim.min.map | 1 - ...isense.js => jquery-3.6.0.intellisense.js} | 0 .../{jquery-3.4.1.js => jquery-3.6.0.js} | 1415 ++++++++++------- .../Scripts/jquery-3.6.0.min.js | 2 + .../Scripts/jquery-3.6.0.min.map | 1 + ...ery-3.4.1.slim.js => jquery-3.6.0.slim.js} | 1355 +++++++++------- .../Scripts/jquery-3.6.0.slim.min.js | 2 + .../Scripts/jquery-3.6.0.slim.min.map | 1 + .../Scripts/jquery.validate-vsdoc.js | 4 +- .../Scripts/jquery.validate.js | 108 +- .../Scripts/jquery.validate.min.js | 6 +- .../Scripts/jquery.validate.unobtrusive.js | 281 +++- .../jquery.validate.unobtrusive.min.js | 282 +++- samples/Exceptionless.SampleMvc/Web.config | 86 +- .../Exceptionless.SampleMvc/packages.config | 28 +- .../Exceptionless.SampleWebApi.csproj | 14 +- src/Exceptionless/Exceptionless.csproj | 2 +- .../Exceptionless.AspNetCore.csproj | 10 +- .../Exceptionless.Extensions.Hosting.csproj | 2 +- .../Exceptionless.Extensions.Logging.csproj | 2 +- .../Exceptionless.Log4net.csproj | 2 +- .../Exceptionless.Mvc.csproj | 6 +- .../Exceptionless.NLog.csproj | 2 +- .../Exceptionless.WebApi.csproj | 2 +- .../Exceptionless.MessagePack.Tests.csproj | 4 +- .../Exceptionless.TestHarness.csproj | 2 +- .../Exceptionless.Tests.csproj | 8 +- 37 files changed, 2464 insertions(+), 1284 deletions(-) delete mode 100644 samples/Exceptionless.SampleMvc/Scripts/jquery-3.4.1.min.js delete mode 100644 samples/Exceptionless.SampleMvc/Scripts/jquery-3.4.1.min.map delete mode 100644 samples/Exceptionless.SampleMvc/Scripts/jquery-3.4.1.slim.min.js delete mode 100644 samples/Exceptionless.SampleMvc/Scripts/jquery-3.4.1.slim.min.map rename samples/Exceptionless.SampleMvc/Scripts/{jquery-3.4.1.intellisense.js => jquery-3.6.0.intellisense.js} (100%) rename samples/Exceptionless.SampleMvc/Scripts/{jquery-3.4.1.js => jquery-3.6.0.js} (90%) create mode 100644 samples/Exceptionless.SampleMvc/Scripts/jquery-3.6.0.min.js create mode 100644 samples/Exceptionless.SampleMvc/Scripts/jquery-3.6.0.min.map rename samples/Exceptionless.SampleMvc/Scripts/{jquery-3.4.1.slim.js => jquery-3.6.0.slim.js} (88%) create mode 100644 samples/Exceptionless.SampleMvc/Scripts/jquery-3.6.0.slim.min.js create mode 100644 samples/Exceptionless.SampleMvc/Scripts/jquery-3.6.0.slim.min.map diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 8f848973..5ccc5665 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -19,7 +19,7 @@ jobs: - name: Build Version shell: bash run: | - dotnet tool install --global minver-cli --version 3.1.0 + dotnet tool install --global minver-cli --version 4.0.0 version=$(minver --tag-prefix v) echo "MINVERVERSIONOVERRIDE=$version" >> $GITHUB_ENV - name: Build diff --git a/.github/workflows/build-osx.yml b/.github/workflows/build-osx.yml index 8cffa2b5..ba1fb188 100644 --- a/.github/workflows/build-osx.yml +++ b/.github/workflows/build-osx.yml @@ -19,7 +19,7 @@ jobs: - name: Build Version shell: bash run: | - dotnet tool install --global minver-cli --version 3.1.0 + dotnet tool install --global minver-cli --version 4.0.0 version=$(minver --tag-prefix v) echo "MINVERVERSIONOVERRIDE=$version" >> $GITHUB_ENV - name: Build diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 945ed1e1..6ed954dd 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -19,7 +19,7 @@ jobs: - name: Build Version shell: bash run: | - dotnet tool install --global minver-cli --version 3.1.0 + dotnet tool install --global minver-cli --version 4.0.0 version=$(minver --tag-prefix v) echo "MINVERVERSIONOVERRIDE=$version" >> $GITHUB_ENV - name: Build diff --git a/build/common.props b/build/common.props index ffc3a1e4..302ada39 100644 --- a/build/common.props +++ b/build/common.props @@ -41,8 +41,8 @@ - - + + diff --git a/samples/Exceptionless.SampleConsole/Exceptionless.SampleConsole.csproj b/samples/Exceptionless.SampleConsole/Exceptionless.SampleConsole.csproj index 0aba3c5e..8feb4fe1 100644 --- a/samples/Exceptionless.SampleConsole/Exceptionless.SampleConsole.csproj +++ b/samples/Exceptionless.SampleConsole/Exceptionless.SampleConsole.csproj @@ -21,7 +21,7 @@ - + diff --git a/samples/Exceptionless.SampleLambdaAspNetCore/Exceptionless.SampleLambdaAspNetCore.csproj b/samples/Exceptionless.SampleLambdaAspNetCore/Exceptionless.SampleLambdaAspNetCore.csproj index 1337d25f..0cedb95d 100644 --- a/samples/Exceptionless.SampleLambdaAspNetCore/Exceptionless.SampleLambdaAspNetCore.csproj +++ b/samples/Exceptionless.SampleLambdaAspNetCore/Exceptionless.SampleLambdaAspNetCore.csproj @@ -5,8 +5,8 @@ Lambda - - + + diff --git a/samples/Exceptionless.SampleMvc/Exceptionless.SampleMvc.csproj b/samples/Exceptionless.SampleMvc/Exceptionless.SampleMvc.csproj index adca5a92..2bcc6a68 100644 --- a/samples/Exceptionless.SampleMvc/Exceptionless.SampleMvc.csproj +++ b/samples/Exceptionless.SampleMvc/Exceptionless.SampleMvc.csproj @@ -1,6 +1,5 @@ - + - Debug @@ -45,12 +44,21 @@ 4 + + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + + ..\..\packages\Microsoft.Web.Infrastructure.2.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + + + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + - - ..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll + + ..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.8\lib\net45\System.Net.Http.Formatting.dll @@ -58,14 +66,32 @@ - - ..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll + + ..\..\packages\Microsoft.AspNet.WebPages.3.2.8\lib\net45\System.Web.Helpers.dll + + + ..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.8\lib\net45\System.Web.Http.dll - - ..\..\packages\Microsoft.AspNet.WebApi.Tracing.5.2.7\lib\net45\System.Web.Http.Tracing.dll + + ..\..\packages\Microsoft.AspNet.WebApi.Tracing.5.2.8\lib\net45\System.Web.Http.Tracing.dll - - ..\..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll + + ..\..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.8\lib\net45\System.Web.Http.WebHost.dll + + + ..\..\packages\Microsoft.AspNet.Mvc.5.2.8\lib\net45\System.Web.Mvc.dll + + + ..\..\packages\Microsoft.AspNet.Razor.3.2.8\lib\net45\System.Web.Razor.dll + + + ..\..\packages\Microsoft.AspNet.WebPages.3.2.8\lib\net45\System.Web.WebPages.dll + + + ..\..\packages\Microsoft.AspNet.WebPages.3.2.8\lib\net45\System.Web.WebPages.Deployment.dll + + + ..\..\packages\Microsoft.AspNet.WebPages.3.2.8\lib\net45\System.Web.WebPages.Razor.dll @@ -76,44 +102,13 @@ - - True - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - True - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - - True - ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll - - True - ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - - - True - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - - - True - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - - - True - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - - - ..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll - True ..\..\packages\WebGrease.1.6.0\lib\WebGrease.dll @@ -123,11 +118,6 @@ ..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - - @@ -149,13 +139,15 @@ + - - - - - + + + + + + @@ -194,8 +186,6 @@ - - @@ -239,11 +229,12 @@ + 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}. - +