diff --git a/.github/setup/action.yml b/.github/setup/action.yml index 360f10360f..8e56243296 100644 --- a/.github/setup/action.yml +++ b/.github/setup/action.yml @@ -36,7 +36,7 @@ runs: with: dotnet-version: | 8.0.x - 6.0.x + 9.0.x - if: ${{ runner.os == 'Windows' }} uses: microsoft/setup-msbuild@v1.1 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bed9b52809..00dc4fa8af 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,43 +37,43 @@ jobs: # framework - name: Core - run: dotnet build src/Framework/Framework --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError + run: dotnet build src/Framework/Framework --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError - name: Framework - run: dotnet build src/Framework/Framework --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError + run: dotnet build src/Framework/Framework --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError - name: Testing - run: dotnet build src/Framework/Testing --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError + run: dotnet build src/Framework/Testing --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError # hosting - name: Hosting.AspNetCore - run: dotnet build src/Framework/Hosting.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError + run: dotnet build src/Framework/Hosting.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError # command-line - name: CommandLine - run: dotnet build src/Tools/CommandLine --configuration ${{ matrix.configuration }} --no-restore --framework net6.0 /WarnAsError + run: dotnet build src/Tools/CommandLine --configuration ${{ matrix.configuration }} --no-restore --framework net8.0 /WarnAsError # swashbuckle - name: Api.Swashbuckle.AspNetCore - run: dotnet build src/Api/Swashbuckle.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError + run: dotnet build src/Api/Swashbuckle.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError # hot reload - name: HotReload.Common - run: dotnet build src/Tools/HotReload/Common --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError + run: dotnet build src/Tools/HotReload/Common --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError - name: HotReload.AspNetCore - run: dotnet build src/Tools/HotReload/AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError + run: dotnet build src/Tools/HotReload/AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError # application insights - name: Tracing.ApplicationInsights - run: dotnet build src/Tracing/ApplicationInsights --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError + run: dotnet build src/Tracing/ApplicationInsights --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError - name: Tracing.ApplicationInsights.AspNetCore - run: dotnet build src/Tracing/ApplicationInsights.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError + run: dotnet build src/Tracing/ApplicationInsights.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError # miniprofiler - name: Tracing.MiniProfiler.AspNetCore - run: dotnet build src/Tracing/MiniProfiler.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError + run: dotnet build src/Tracing/MiniProfiler.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError # dynamic data - name: DynamicData - run: dotnet build src/DynamicData/DynamicData --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError + run: dotnet build src/DynamicData/DynamicData --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError build-all: name: Build all projects without errors @@ -125,7 +125,7 @@ jobs: title: Framework Tests github-token: ${{ secrets.GITHUB_TOKEN }} target-framework: net472 - - name: Analyzers.Tests (net6.0) + - name: Analyzers.Tests (net8.0) uses: ./.github/unittest if: ${{ success() || failure() }} with: @@ -133,7 +133,7 @@ jobs: name: analyzers-tests title: Analyzer Tests github-token: ${{ secrets.GITHUB_TOKEN }} - target-framework: net6.0 + target-framework: net8.0 # - name: Analyzers.Tests (net7.0) # uses: ./.github/unittest # with: diff --git a/src/Analyzers/Analyzers.Tests/DotVVM.Analyzers.Tests.csproj b/src/Analyzers/Analyzers.Tests/DotVVM.Analyzers.Tests.csproj index a50b53b11f..1dc7504954 100644 --- a/src/Analyzers/Analyzers.Tests/DotVVM.Analyzers.Tests.csproj +++ b/src/Analyzers/Analyzers.Tests/DotVVM.Analyzers.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + $(DotnetCoreTargetVersion) true true enable diff --git a/src/Api/Swashbuckle.AspNetCore.Tests/DotVVM.Framework.Api.Swashbuckle.AspNetCore.Tests.csproj b/src/Api/Swashbuckle.AspNetCore.Tests/DotVVM.Framework.Api.Swashbuckle.AspNetCore.Tests.csproj index f8f23db9d5..e7691d73c5 100644 --- a/src/Api/Swashbuckle.AspNetCore.Tests/DotVVM.Framework.Api.Swashbuckle.AspNetCore.Tests.csproj +++ b/src/Api/Swashbuckle.AspNetCore.Tests/DotVVM.Framework.Api.Swashbuckle.AspNetCore.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + $(DotnetCoreTargetVersion) false diff --git a/src/Api/Swashbuckle.AspNetCore/DotVVM.Framework.Api.Swashbuckle.AspNetCore.csproj b/src/Api/Swashbuckle.AspNetCore/DotVVM.Framework.Api.Swashbuckle.AspNetCore.csproj index ac2ef5804a..1e94564a33 100644 --- a/src/Api/Swashbuckle.AspNetCore/DotVVM.Framework.Api.Swashbuckle.AspNetCore.csproj +++ b/src/Api/Swashbuckle.AspNetCore/DotVVM.Framework.Api.Swashbuckle.AspNetCore.csproj @@ -1,7 +1,7 @@  - netstandard2.1;net6.0 + $(DotnetCoreTargetVersion) DotVVM.Api.Swashbuckle.AspNetCore Swashbuckle.AspNetCore extensions for DotVVM. diff --git a/src/Directory.Build.props b/src/Directory.Build.props index cc0bba6d99..8f9926f335 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -25,8 +25,12 @@ $(NoWarn);CS1591;CS1573 true true - netstandard2.1;net6.0;net472 - netstandard2.1;net6.0 + net472 + net8.0 + net9.0 + + netstandard2.1;$(DotnetCoreTargetVersion);$(OldFrameworkTargetVersion) + netstandard2.1;$(DotnetCoreTargetVersion); true false diff --git a/src/Framework/Core/DotVVM.Core.csproj b/src/Framework/Core/DotVVM.Core.csproj index 73c398593c..c0ad87deaa 100644 --- a/src/Framework/Core/DotVVM.Core.csproj +++ b/src/Framework/Core/DotVVM.Core.csproj @@ -16,10 +16,10 @@ - + @@ -28,6 +28,7 @@ all + $(DefineConstants);RELEASE diff --git a/src/Framework/Framework/Compilation/DotvvmCompilationException.cs b/src/Framework/Framework/Compilation/DotvvmCompilationException.cs index edf6a949fa..46417e084e 100644 --- a/src/Framework/Framework/Compilation/DotvvmCompilationException.cs +++ b/src/Framework/Framework/Compilation/DotvvmCompilationException.cs @@ -91,12 +91,6 @@ public DotvvmCompilationException(DotvvmCompilationDiagnostic primaryError, IEnu } public DotvvmCompilationException(string message, IEnumerable? tokens) : this(message, null, tokens) { } - protected DotvvmCompilationException( - SerializationInfo info, - StreamingContext context) : base(info, context) - { - CompilationError = new DotvvmCompilationDiagnostic(this.Message, DiagnosticSeverity.Error, null, innerException: this.InnerException); - } /// Creates a compilation error if the provided list of diagnostics contains an error. public static DotvvmCompilationException? TryCreateFromDiagnostics(IEnumerable diagnostics) diff --git a/src/Framework/Framework/Configuration/DotvvmConfigurationException.cs b/src/Framework/Framework/Configuration/DotvvmConfigurationException.cs index 04575fccf9..11a6c8c591 100644 --- a/src/Framework/Framework/Configuration/DotvvmConfigurationException.cs +++ b/src/Framework/Framework/Configuration/DotvvmConfigurationException.cs @@ -102,9 +102,5 @@ private static void BuildControlsMessage(List DotVVM - $(DefaultTargetFrameworks) + $(DefaultTargetFrameworks);$(DotnetCoreLatestTargetVersion) true dotvvmwizard.snk true diff --git a/src/Framework/Framework/Security/CorruptedCsrfTokenException.cs b/src/Framework/Framework/Security/CorruptedCsrfTokenException.cs index 01ed679bdc..cae31e5532 100644 --- a/src/Framework/Framework/Security/CorruptedCsrfTokenException.cs +++ b/src/Framework/Framework/Security/CorruptedCsrfTokenException.cs @@ -9,9 +9,6 @@ public class CorruptedCsrfTokenException: Exception { /// If the client is supposed to retry the request after renewing the CSRF token by the public bool RetryRequest { get; } - protected CorruptedCsrfTokenException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context) - { - } public CorruptedCsrfTokenException(string message, bool retry = true) : base(message) { diff --git a/src/Framework/Framework/Testing/TestCookieCollection.cs b/src/Framework/Framework/Testing/TestCookieCollection.cs index 5d1ef906c8..b3f8b7965e 100644 --- a/src/Framework/Framework/Testing/TestCookieCollection.cs +++ b/src/Framework/Framework/Testing/TestCookieCollection.cs @@ -30,9 +30,5 @@ public TestCookieCollection(int capacity) : base(capacity) public TestCookieCollection(int capacity, IEqualityComparer comparer) : base(capacity, comparer) { } - - protected TestCookieCollection(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context) - { - } } } diff --git a/src/Framework/Framework/Testing/TestHeaderCollection.cs b/src/Framework/Framework/Testing/TestHeaderCollection.cs index 53e08b423e..c121fd0f35 100644 --- a/src/Framework/Framework/Testing/TestHeaderCollection.cs +++ b/src/Framework/Framework/Testing/TestHeaderCollection.cs @@ -31,10 +31,6 @@ public TestHeaderCollection(int capacity, IEqualityComparer comparer) : { } - protected TestHeaderCollection(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context) - { - } - string? IHeaderCollection.this[string key] { get => this.TryGetValue(key, out var headers) ? string.Join("; ", headers) : null; diff --git a/src/Framework/Framework/Testing/TestQueryCollection.cs b/src/Framework/Framework/Testing/TestQueryCollection.cs index f553c8d2a1..065a294655 100644 --- a/src/Framework/Framework/Testing/TestQueryCollection.cs +++ b/src/Framework/Framework/Testing/TestQueryCollection.cs @@ -31,10 +31,6 @@ public TestQueryCollection(int capacity, IEqualityComparer comparer) : b { } - protected TestQueryCollection(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context) - { - } - public bool Equals(TestQueryCollection? other) => Object.ReferenceEquals(this, other) || other != null && other.OrderBy(k => k.Key).SequenceEqual(this.OrderBy(k => k.Key)); diff --git a/src/Framework/Framework/Utils/ReflectionUtils.cs b/src/Framework/Framework/Utils/ReflectionUtils.cs index 273fd1bffe..75daf8bf6e 100644 --- a/src/Framework/Framework/Utils/ReflectionUtils.cs +++ b/src/Framework/Framework/Utils/ReflectionUtils.cs @@ -478,7 +478,11 @@ public static Type MakeNullableType(this Type type) return BoxingUtils.Zero; // see https://github.com/dotnet/runtime/issues/90697 // notably we can't use Activator.CreateInstance, because C# now allows default constructors in structs +#if DotNetCore + return RuntimeHelpers.GetUninitializedObject(type); +#else return FormatterServices.GetUninitializedObject(type); +#endif } public static Type UnwrapTaskType(this Type type) diff --git a/src/Framework/Hosting.AspNetCore/DotVVM.Framework.Hosting.AspNetCore.csproj b/src/Framework/Hosting.AspNetCore/DotVVM.Framework.Hosting.AspNetCore.csproj index 05413c81d0..4cdbbe3d74 100644 --- a/src/Framework/Hosting.AspNetCore/DotVVM.Framework.Hosting.AspNetCore.csproj +++ b/src/Framework/Hosting.AspNetCore/DotVVM.Framework.Hosting.AspNetCore.csproj @@ -1,6 +1,6 @@  - netstandard2.1;net6.0 + $(DotnetCoreTargetVersion) true dotvvmwizard.snk true diff --git a/src/Framework/Hosting.AspNetCore/Hosting/DotvvmHeaderCollection.cs b/src/Framework/Hosting.AspNetCore/Hosting/DotvvmHeaderCollection.cs index 60a388adb5..4e8c5959d4 100644 --- a/src/Framework/Hosting.AspNetCore/Hosting/DotvvmHeaderCollection.cs +++ b/src/Framework/Hosting.AspNetCore/Hosting/DotvvmHeaderCollection.cs @@ -76,7 +76,9 @@ public bool Remove(KeyValuePair item) public bool IsReadOnly => OriginalHeaders.IsReadOnly; public void Add(string key, string[] value) { +#pragma warning disable ASP0019 // Don't use Add to append headers OriginalHeaders.Add(key, new StringValues(value)); +#pragma warning restore ASP0019 } public bool ContainsKey(string key) @@ -115,4 +117,4 @@ protected static KeyValuePair ConvertKeyValuePair(KeyValue new KeyValuePair(toConvert.Key, new StringValues(toConvert.Value)); #endregion } -} \ No newline at end of file +} diff --git a/src/Samples/Api.AspNetCore/DotVVM.Samples.BasicSamples.Api.AspNetCore.csproj b/src/Samples/Api.AspNetCore/DotVVM.Samples.BasicSamples.Api.AspNetCore.csproj index 6162ecc6eb..0b8831b816 100644 --- a/src/Samples/Api.AspNetCore/DotVVM.Samples.BasicSamples.Api.AspNetCore.csproj +++ b/src/Samples/Api.AspNetCore/DotVVM.Samples.BasicSamples.Api.AspNetCore.csproj @@ -1,7 +1,7 @@  - net6.0 + $(DotnetCoreTargetVersion) diff --git a/src/Samples/Api.AspNetCoreLatest/DotVVM.Samples.BasicSamples.Api.AspNetCoreLatest.csproj b/src/Samples/Api.AspNetCoreLatest/DotVVM.Samples.BasicSamples.Api.AspNetCoreLatest.csproj index d7d4982a4b..3acc612278 100644 --- a/src/Samples/Api.AspNetCoreLatest/DotVVM.Samples.BasicSamples.Api.AspNetCoreLatest.csproj +++ b/src/Samples/Api.AspNetCoreLatest/DotVVM.Samples.BasicSamples.Api.AspNetCoreLatest.csproj @@ -1,7 +1,7 @@  - net8.0 + $(DotnetCoreLatestTargetVersion) diff --git a/src/Samples/ApplicationInsights.AspNetCore/DotVVM.Samples.ApplicationInsights.AspNetCore.csproj b/src/Samples/ApplicationInsights.AspNetCore/DotVVM.Samples.ApplicationInsights.AspNetCore.csproj index 0af15fb09c..646eb027cb 100644 --- a/src/Samples/ApplicationInsights.AspNetCore/DotVVM.Samples.ApplicationInsights.AspNetCore.csproj +++ b/src/Samples/ApplicationInsights.AspNetCore/DotVVM.Samples.ApplicationInsights.AspNetCore.csproj @@ -1,6 +1,6 @@  - net6.0 + $(DotnetCoreTargetVersion) /subscriptions/1f41fa3c-37d6-4b89-b5dc-913463de0d9a/resourcegroups/DotVVMWeb/providers/microsoft.insights/components/DotvvmTrackingPoints /subscriptions/1f41fa3c-37d6-4b89-b5dc-913463de0d9a/resourcegroups/DotVVMWeb/providers/microsoft.insights/components/DotvvmTrackingPoints diff --git a/src/Samples/AspNetCore/DotVVM.Samples.BasicSamples.AspNetCore.csproj b/src/Samples/AspNetCore/DotVVM.Samples.BasicSamples.AspNetCore.csproj index ccbe3a5562..21bd4d96fd 100644 --- a/src/Samples/AspNetCore/DotVVM.Samples.BasicSamples.AspNetCore.csproj +++ b/src/Samples/AspNetCore/DotVVM.Samples.BasicSamples.AspNetCore.csproj @@ -1,6 +1,6 @@  - net6.0 + $(DotnetCoreTargetVersion) Exe diff --git a/src/Samples/AspNetCoreLatest/DotVVM.Samples.BasicSamples.AspNetCoreLatest.csproj b/src/Samples/AspNetCoreLatest/DotVVM.Samples.BasicSamples.AspNetCoreLatest.csproj index e35a379212..747bc6c217 100644 --- a/src/Samples/AspNetCoreLatest/DotVVM.Samples.BasicSamples.AspNetCoreLatest.csproj +++ b/src/Samples/AspNetCoreLatest/DotVVM.Samples.BasicSamples.AspNetCoreLatest.csproj @@ -1,6 +1,6 @@  - net8.0 + $(DotnetCoreLatestTargetVersion) Exe diff --git a/src/Samples/MiniProfiler.AspNetCore/DotVVM.Samples.MiniProfiler.AspNetCore.csproj b/src/Samples/MiniProfiler.AspNetCore/DotVVM.Samples.MiniProfiler.AspNetCore.csproj index 6c7198a40c..0dd752e4c5 100644 --- a/src/Samples/MiniProfiler.AspNetCore/DotVVM.Samples.MiniProfiler.AspNetCore.csproj +++ b/src/Samples/MiniProfiler.AspNetCore/DotVVM.Samples.MiniProfiler.AspNetCore.csproj @@ -1,6 +1,6 @@  - net6.0 + $(DotnetCoreTargetVersion) @@ -14,11 +14,11 @@ - - - - - + + + + + diff --git a/src/Samples/Tests/Abstractions/DotVVM.Testing.Abstractions.csproj b/src/Samples/Tests/Abstractions/DotVVM.Testing.Abstractions.csproj index a60608125f..46b77dc8e7 100644 --- a/src/Samples/Tests/Abstractions/DotVVM.Testing.Abstractions.csproj +++ b/src/Samples/Tests/Abstractions/DotVVM.Testing.Abstractions.csproj @@ -1,7 +1,7 @@ - net6.0 + $(DotnetCoreTargetVersion) diff --git a/src/Samples/Tests/CompletenessChecker/DotVVM.Samples.Tests.CompletenessChecker.csproj b/src/Samples/Tests/CompletenessChecker/DotVVM.Samples.Tests.CompletenessChecker.csproj index f66f73d9cc..2270ca5769 100644 --- a/src/Samples/Tests/CompletenessChecker/DotVVM.Samples.Tests.CompletenessChecker.csproj +++ b/src/Samples/Tests/CompletenessChecker/DotVVM.Samples.Tests.CompletenessChecker.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + $(DotnetCoreTargetVersion) true @@ -19,4 +19,4 @@ - \ No newline at end of file + diff --git a/src/Samples/Tests/Tests/DotVVM.Samples.Tests.csproj b/src/Samples/Tests/Tests/DotVVM.Samples.Tests.csproj index 3f1ad03e6e..05403798fa 100644 --- a/src/Samples/Tests/Tests/DotVVM.Samples.Tests.csproj +++ b/src/Samples/Tests/Tests/DotVVM.Samples.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + $(DotnetCoreTargetVersion) false diff --git a/src/Tests/DotVVM.Framework.Tests.csproj b/src/Tests/DotVVM.Framework.Tests.csproj index a9e51aa0b8..0e838405dc 100644 --- a/src/Tests/DotVVM.Framework.Tests.csproj +++ b/src/Tests/DotVVM.Framework.Tests.csproj @@ -13,8 +13,8 @@ Library - net8.0;net472 - net8.0 + $(DotnetCoreTargetVersion);$(OldFrameworkTargetVersion) + $(DotnetCoreTargetVersion) true @@ -30,17 +30,17 @@ - + $(DefineConstants);DotNetCore - + - + diff --git a/src/Tools/AppStartupInstabilityTester.py b/src/Tools/AppStartupInstabilityTester.py index 80e6f77f32..213675e9c3 100644 --- a/src/Tools/AppStartupInstabilityTester.py +++ b/src/Tools/AppStartupInstabilityTester.py @@ -5,7 +5,7 @@ parser = argparse.ArgumentParser(description="Repeatedly starts the server and every time checks if some pages are working, use to find startup-time race condition bugs") parser.add_argument("--port", type=int, default=16017, help="Port to run the server on") parser.add_argument("--working-directory", type=str, default=".", help="Working directory to run the server in") -parser.add_argument("--server-path", type=str, default="bin/Debug/net8.0/DotVVM.Samples.BasicSamples.AspNetCoreLatest", help="Path to the server executable") +parser.add_argument("--server-path", type=str, default="bin/Debug/net9.0/DotVVM.Samples.BasicSamples.AspNetCoreLatest", help="Path to the server executable") parser.add_argument("--environment", type=str, default="Development", help="Asp.Net Core environment (Development, Production)") args = parser.parse_args() diff --git a/src/Tools/CommandLine/DotVVM.CommandLine.csproj b/src/Tools/CommandLine/DotVVM.CommandLine.csproj index 99c963d69b..fceeb445c9 100644 --- a/src/Tools/CommandLine/DotVVM.CommandLine.csproj +++ b/src/Tools/CommandLine/DotVVM.CommandLine.csproj @@ -3,7 +3,7 @@ DotVVM.CommandLine dotnet-dotvvm - net6.0 + $(DotnetCoreTargetVersion) dotvvmwizard.snk true Exe @@ -51,14 +51,14 @@ false - TargetFramework=net6.0 - PublishDir=$(OutputPath)tools\net6.0\any + TargetFramework=$(DotnetCoreTargetVersion) + PublishDir=$(OutputPath)tools\$(DotnetCoreTargetVersion)\any Publish false - TargetFramework=net472 - PublishDir=$(OutputPath)tools\net472\any + TargetFramework=$(OldFrameworkTargetVersion) + PublishDir=$(OutputPath)tools\$(OldFrameworkTargetVersion)\any Publish diff --git a/src/Tools/Compiler/DotVVM.Compiler.csproj b/src/Tools/Compiler/DotVVM.Compiler.csproj index 05560cd3cc..4d495693ee 100644 --- a/src/Tools/Compiler/DotVVM.Compiler.csproj +++ b/src/Tools/Compiler/DotVVM.Compiler.csproj @@ -10,12 +10,12 @@ for some reason. What fun. --> - net6.0 - net6.0;net472 + $(DotnetCoreTargetVersion) + $(DotnetCoreTargetVersion);$(OldFrameworkTargetVersion) true Exe enable - win7-x86;win7-x64;win10-x64;ubuntu.16.10-x64 + win-x86;win-x64;linux-x64 false false LatestMajor diff --git a/src/Tools/HotReload/AspNetCore/DotVVM.HotReload.AspNetCore.csproj b/src/Tools/HotReload/AspNetCore/DotVVM.HotReload.AspNetCore.csproj index 66edfe7232..46e0121f1b 100644 --- a/src/Tools/HotReload/AspNetCore/DotVVM.HotReload.AspNetCore.csproj +++ b/src/Tools/HotReload/AspNetCore/DotVVM.HotReload.AspNetCore.csproj @@ -2,7 +2,7 @@ DotVVM.HotReload.AspNetCore - net6.0 + $(DotnetCoreTargetVersion) true dotvvmwizard.snk true diff --git a/src/Tools/StartupPerfTester/DotVVM.Tools.StartupPerfTester.csproj b/src/Tools/StartupPerfTester/DotVVM.Tools.StartupPerfTester.csproj index 7f84806f1a..7f44e64748 100644 --- a/src/Tools/StartupPerfTester/DotVVM.Tools.StartupPerfTester.csproj +++ b/src/Tools/StartupPerfTester/DotVVM.Tools.StartupPerfTester.csproj @@ -1,6 +1,6 @@  - net6.0 + $(DotnetCoreTargetVersion) Exe dotvvmwizard.snk true diff --git a/src/Tracing/ApplicationInsights.AspNetCore/DotVVM.Tracing.ApplicationInsights.AspNetCore.csproj b/src/Tracing/ApplicationInsights.AspNetCore/DotVVM.Tracing.ApplicationInsights.AspNetCore.csproj index 966e6715a3..475ba9f7d1 100644 --- a/src/Tracing/ApplicationInsights.AspNetCore/DotVVM.Tracing.ApplicationInsights.AspNetCore.csproj +++ b/src/Tracing/ApplicationInsights.AspNetCore/DotVVM.Tracing.ApplicationInsights.AspNetCore.csproj @@ -1,7 +1,7 @@  DotVVM.Tracing.ApplicationInsights.AspNetCore - netstandard2.1;net6.0 + $(DotnetCoreTargetVersion) true dotvvmwizard.snk true diff --git a/src/Tracing/MiniProfiler.AspNetCore/DotVVM.Tracing.MiniProfiler.AspNetCore.csproj b/src/Tracing/MiniProfiler.AspNetCore/DotVVM.Tracing.MiniProfiler.AspNetCore.csproj index 4c697e8df3..952453bc5a 100644 --- a/src/Tracing/MiniProfiler.AspNetCore/DotVVM.Tracing.MiniProfiler.AspNetCore.csproj +++ b/src/Tracing/MiniProfiler.AspNetCore/DotVVM.Tracing.MiniProfiler.AspNetCore.csproj @@ -1,7 +1,7 @@  DotVVM.Tracing.MiniProfiler.AspNetCore - netstandard2.1;net6.0 + $(DotnetCoreTargetVersion) true dotvvmwizard.snk true @@ -12,7 +12,7 @@ - +