From 9790a9c5184c04a349aeae8cd8a32889b50accfb Mon Sep 17 00:00:00 2001 From: Vitaliy K Date: Sun, 21 Nov 2021 17:16:25 -0500 Subject: [PATCH 1/2] .NET 6 release (#265) * Upgrade to .NET 6 release, closes #264 * Upgrade dependencies * Switch to Visual Studio 2022 image in Appveyor * Disable SQL connection encryption in unit-tests. This is breaking change in Microsoft.Data.SqlClient 4.0 --- Directory.Build.props | 5 ----- .../Suteki.TardisBank.Infrastructure.csproj | 2 +- .../Suteki.TardisBank.Tests.csproj | 8 ++++---- .../Src/Suteki.TardisBank.WebApi/NHibernate.config | 2 +- .../Suteki.TardisBank.WebApi.csproj | 12 ++++++------ .../App/TransactionAttribute.WebApi.csproj | 10 +++++----- .../Tests/TransactionAttribute.Tests.csproj | 4 ++-- Src/Directory.Build.props | 2 +- Src/SharpArch.Domain/SharpArch.Domain.csproj | 4 ---- .../SharpArch.Infrastructure.csproj | 2 +- ....NHibernate.Extensions.DependencyInjection.csproj | 2 +- Src/SharpArch.RavenDb/SharpArch.RavenDb.csproj | 2 +- .../SharpArch.Tests.NHibernate.csproj | 4 ++-- .../SharpArch.XunitTests.NHibernate.csproj | 2 +- appveyor.yml | 8 +++----- 15 files changed, 29 insertions(+), 40 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 1318504a..e298640c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -74,11 +74,6 @@ $(NoWarn);1591 - - - preview - - <_Parameter1>false diff --git a/Samples/TardisBank/Src/Suteki.TardisBank.Infrastructure/Suteki.TardisBank.Infrastructure.csproj b/Samples/TardisBank/Src/Suteki.TardisBank.Infrastructure/Suteki.TardisBank.Infrastructure.csproj index 87ac0d3a..01036ad4 100644 --- a/Samples/TardisBank/Src/Suteki.TardisBank.Infrastructure/Suteki.TardisBank.Infrastructure.csproj +++ b/Samples/TardisBank/Src/Suteki.TardisBank.Infrastructure/Suteki.TardisBank.Infrastructure.csproj @@ -7,7 +7,7 @@ - + diff --git a/Samples/TardisBank/Src/Suteki.TardisBank.Tests/Suteki.TardisBank.Tests.csproj b/Samples/TardisBank/Src/Suteki.TardisBank.Tests/Suteki.TardisBank.Tests.csproj index cf2a62d9..1e3ad17f 100644 --- a/Samples/TardisBank/Src/Suteki.TardisBank.Tests/Suteki.TardisBank.Tests.csproj +++ b/Samples/TardisBank/Src/Suteki.TardisBank.Tests/Suteki.TardisBank.Tests.csproj @@ -4,14 +4,14 @@ - + - - + + all @@ -28,7 +28,7 @@ - + diff --git a/Samples/TardisBank/Src/Suteki.TardisBank.WebApi/NHibernate.config b/Samples/TardisBank/Src/Suteki.TardisBank.WebApi/NHibernate.config index 4a5b0ee8..995184d2 100644 --- a/Samples/TardisBank/Src/Suteki.TardisBank.WebApi/NHibernate.config +++ b/Samples/TardisBank/Src/Suteki.TardisBank.WebApi/NHibernate.config @@ -1,7 +1,7 @@ - Data Source=localhost,2433;Initial Catalog=TardisBank;Integrated Security=False;User ID=sa;Password=Password12!;Application Name=Suteki.TardisBank; + Data Source=localhost,2433;Initial Catalog=TardisBank;Integrated Security=False;User ID=sa;Password=Password12!;Application Name=Suteki.TardisBank;Encrypt=false; NHibernate.Dialect.MsSql2012Dialect NHibernate.Connection.DriverConnectionProvider NHibernate.Driver.MicrosoftDataSqlClientDriver diff --git a/Samples/TardisBank/Src/Suteki.TardisBank.WebApi/Suteki.TardisBank.WebApi.csproj b/Samples/TardisBank/Src/Suteki.TardisBank.WebApi/Suteki.TardisBank.WebApi.csproj index 212ac0b5..50ec0b36 100644 --- a/Samples/TardisBank/Src/Suteki.TardisBank.WebApi/Suteki.TardisBank.WebApi.csproj +++ b/Samples/TardisBank/Src/Suteki.TardisBank.WebApi/Suteki.TardisBank.WebApi.csproj @@ -8,13 +8,13 @@ - - + + - - + + - + @@ -26,7 +26,7 @@ - + diff --git a/Samples/TransactionAttribute/App/TransactionAttribute.WebApi.csproj b/Samples/TransactionAttribute/App/TransactionAttribute.WebApi.csproj index 53e0bb97..41cf0a3e 100644 --- a/Samples/TransactionAttribute/App/TransactionAttribute.WebApi.csproj +++ b/Samples/TransactionAttribute/App/TransactionAttribute.WebApi.csproj @@ -6,12 +6,12 @@ - + - - + + - + @@ -23,7 +23,7 @@ - + diff --git a/Samples/TransactionAttribute/Tests/TransactionAttribute.Tests.csproj b/Samples/TransactionAttribute/Tests/TransactionAttribute.Tests.csproj index b7d1ede7..61bdcec6 100644 --- a/Samples/TransactionAttribute/Tests/TransactionAttribute.Tests.csproj +++ b/Samples/TransactionAttribute/Tests/TransactionAttribute.Tests.csproj @@ -7,7 +7,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/Src/Directory.Build.props b/Src/Directory.Build.props index 2cd75296..2bafb61b 100644 --- a/Src/Directory.Build.props +++ b/Src/Directory.Build.props @@ -4,7 +4,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Src/SharpArch.Domain/SharpArch.Domain.csproj b/Src/SharpArch.Domain/SharpArch.Domain.csproj index ebe131ee..b893d442 100644 --- a/Src/SharpArch.Domain/SharpArch.Domain.csproj +++ b/Src/SharpArch.Domain/SharpArch.Domain.csproj @@ -26,8 +26,4 @@ - - - - diff --git a/Src/SharpArch.Infrastructure/SharpArch.Infrastructure.csproj b/Src/SharpArch.Infrastructure/SharpArch.Infrastructure.csproj index 697111f8..b5ca3125 100644 --- a/Src/SharpArch.Infrastructure/SharpArch.Infrastructure.csproj +++ b/Src/SharpArch.Infrastructure/SharpArch.Infrastructure.csproj @@ -27,7 +27,7 @@ - + diff --git a/Src/SharpArch.NHibernate.DependencyInjection/SharpArch.NHibernate.Extensions.DependencyInjection.csproj b/Src/SharpArch.NHibernate.DependencyInjection/SharpArch.NHibernate.Extensions.DependencyInjection.csproj index 50177bc6..4af04468 100644 --- a/Src/SharpArch.NHibernate.DependencyInjection/SharpArch.NHibernate.Extensions.DependencyInjection.csproj +++ b/Src/SharpArch.NHibernate.DependencyInjection/SharpArch.NHibernate.Extensions.DependencyInjection.csproj @@ -27,7 +27,7 @@ - + diff --git a/Src/SharpArch.RavenDb/SharpArch.RavenDb.csproj b/Src/SharpArch.RavenDb/SharpArch.RavenDb.csproj index c1046287..7d397b37 100644 --- a/Src/SharpArch.RavenDb/SharpArch.RavenDb.csproj +++ b/Src/SharpArch.RavenDb/SharpArch.RavenDb.csproj @@ -15,7 +15,7 @@ - + diff --git a/Src/Tests/SharpArch.Tests.NHibernate/SharpArch.Tests.NHibernate.csproj b/Src/Tests/SharpArch.Tests.NHibernate/SharpArch.Tests.NHibernate.csproj index 3f794b1f..ac745265 100644 --- a/Src/Tests/SharpArch.Tests.NHibernate/SharpArch.Tests.NHibernate.csproj +++ b/Src/Tests/SharpArch.Tests.NHibernate/SharpArch.Tests.NHibernate.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/Src/Tests/SharpArch.XunitTests.NHibernate/SharpArch.XunitTests.NHibernate.csproj b/Src/Tests/SharpArch.XunitTests.NHibernate/SharpArch.XunitTests.NHibernate.csproj index 0e848701..6162f264 100644 --- a/Src/Tests/SharpArch.XunitTests.NHibernate/SharpArch.XunitTests.NHibernate.csproj +++ b/Src/Tests/SharpArch.XunitTests.NHibernate/SharpArch.XunitTests.NHibernate.csproj @@ -11,7 +11,7 @@ - + all diff --git a/appveyor.yml b/appveyor.yml index 71ddc890..fbe5684e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,7 @@ nuget: image: - Ubuntu - - Visual Studio 2019 + - Visual Studio 2022 environment: CAKE_SETTINGS_SKIPVERIFICATION: true @@ -18,7 +18,6 @@ environment: install: - ps: ./mssql-setup.ps1 - - ps: ./dotnet-install.ps1 -Version 6.0.100-rc.2.21505.57 -InstallDir "C:\Program Files\dotnet" - ps: dotnet new tool-manifest - ps: dotnet tool install Cake.Tool --version 1.3.0 @@ -36,12 +35,11 @@ for: - matrix: except: - - image: Visual Studio 2019 + - image: Visual Studio 2022 clone_folder: ~/work/sharp-arch install: - - sh: sudo ./dotnet-install.sh -Version 6.0.100-rc.2.21505.57 -InstallDir /usr/share/dotnet/ - sh: touch ./Src/Common/AssemblyVersion.cs - sh: dotnet new tool-manifest @@ -53,7 +51,7 @@ for: - matrix: only: - - image: Visual Studio 2019 + - image: Visual Studio 2022 clone_folder: c:\work\sharp-arch From 03a46765699f9ec40ccb781364d5f95a5bf8a5e8 Mon Sep 17 00:00:00 2001 From: vk Date: Sun, 21 Nov 2021 17:23:30 -0500 Subject: [PATCH 2/2] Release 8.0.1 --- Directory.Build.props | 2 +- VersionHistory.txt | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index e298640c..8d135aca 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -44,7 +44,7 @@ https://github.com/sharparchitecture/Sharp-Architecture/raw/master/Artefacts/Documentation/icon.png http://sharparchitecture.github.io/ false - https://github.com/sharparchitecture/Sharp-Architecture/releases/tag/8.0.0 + https://github.com/sharparchitecture/Sharp-Architecture/releases/tag/8.0.1 sharp-architecture;sharp-arch diff --git a/VersionHistory.txt b/VersionHistory.txt index e40a4fa3..834ae819 100644 --- a/VersionHistory.txt +++ b/VersionHistory.txt @@ -2,6 +2,11 @@ vNext ======================== +8.0.1 +======================== +* .NET 6 support (upgrade from RC to release) + + 8.0.0 ======================== BREAKING: