diff --git a/.travis.yml b/.travis.yml index 7d18c54..4c82492 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: csharp mono: none -dotnet: 2.1.402 +dotnet: 6.0.401 script: - dotnet restore - dotnet pack diff --git a/Directory.Build.props b/Directory.Build.props index 012f816..a4a7c70 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -30,15 +30,10 @@ latest - - - - - 3.0.0.0 - 3.2.2 + 3.2.3 diff --git a/Orleans.Redis.sln b/Orleans.Redis.sln index a5300fa..ca34697 100644 --- a/Orleans.Redis.sln +++ b/Orleans.Redis.sln @@ -23,9 +23,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleans.Reminders.Redis", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleans.Reminders.Redis.Tests", "test\Orleans.Reminders.Redis.Tests\Orleans.Reminders.Redis.Tests.csproj", "{93784B16-A101-4E1D-90E0-07321840A25A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orleans.Reminders.Redis.TestGrainInterfaces", "test\Orleans.Reminders.Redis.TestGrainInterfaces\Orleans.Reminders.Redis.TestGrainInterfaces.csproj", "{AE9BCC1F-5E37-4EB2-B7F6-B39480F305F1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleans.Reminders.Redis.TestGrainInterfaces", "test\Orleans.Reminders.Redis.TestGrainInterfaces\Orleans.Reminders.Redis.TestGrainInterfaces.csproj", "{AE9BCC1F-5E37-4EB2-B7F6-B39480F305F1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orleans.Reminders.Redis.TestGrains", "test\Orleans.Reminders.Redis.TestGrains\Orleans.Reminders.Redis.TestGrains.csproj", "{6BC99DF6-E0A0-4DE7-BBCF-B1CE40E67C1D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleans.Reminders.Redis.TestGrains", "test\Orleans.Reminders.Redis.TestGrains\Orleans.Reminders.Redis.TestGrains.csproj", "{6BC99DF6-E0A0-4DE7-BBCF-B1CE40E67C1D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D4641EB6-DA0C-44E1-B454-837919919E43}" + ProjectSection(SolutionItems) = preProject + Packages.props = Packages.props + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Packages.props b/Packages.props new file mode 100644 index 0000000..fa9f012 --- /dev/null +++ b/Packages.props @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/global.json b/global.json index 459551b..ef5ea15 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "5.0.400" + "version": "6.0.401" } } diff --git a/samples/HelloWorld.Grains/HelloWorld.Grains.csproj b/samples/HelloWorld.Grains/HelloWorld.Grains.csproj index 4c0cc5e..d9936b6 100644 --- a/samples/HelloWorld.Grains/HelloWorld.Grains.csproj +++ b/samples/HelloWorld.Grains/HelloWorld.Grains.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6.0 latest diff --git a/samples/HelloWorld.Interfaces/HelloWorld.Interfaces.csproj b/samples/HelloWorld.Interfaces/HelloWorld.Interfaces.csproj index 7cf97f6..15b4be9 100644 --- a/samples/HelloWorld.Interfaces/HelloWorld.Interfaces.csproj +++ b/samples/HelloWorld.Interfaces/HelloWorld.Interfaces.csproj @@ -2,7 +2,7 @@ Library - netcoreapp3.1 + net6.0 latest diff --git a/samples/RedisClient/RedisClient.csproj b/samples/RedisClient/RedisClient.csproj index d5167ed..488609c 100644 --- a/samples/RedisClient/RedisClient.csproj +++ b/samples/RedisClient/RedisClient.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 latest diff --git a/samples/RedisGatewayHost/RedisGatewayHost.csproj b/samples/RedisGatewayHost/RedisGatewayHost.csproj index c259a1b..b3f7160 100644 --- a/samples/RedisGatewayHost/RedisGatewayHost.csproj +++ b/samples/RedisGatewayHost/RedisGatewayHost.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 latest diff --git a/samples/RedisSiloHost/RedisSiloHost.csproj b/samples/RedisSiloHost/RedisSiloHost.csproj index c259a1b..b3f7160 100644 --- a/samples/RedisSiloHost/RedisSiloHost.csproj +++ b/samples/RedisSiloHost/RedisSiloHost.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 latest diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 629579e..6522ce5 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -14,7 +14,7 @@ - + \ No newline at end of file diff --git a/src/Orleans.Clustering.Redis/Orleans.Clustering.Redis.csproj b/src/Orleans.Clustering.Redis/Orleans.Clustering.Redis.csproj index 1659569..db96c6d 100644 --- a/src/Orleans.Clustering.Redis/Orleans.Clustering.Redis.csproj +++ b/src/Orleans.Clustering.Redis/Orleans.Clustering.Redis.csproj @@ -1,7 +1,8 @@  + - netstandard2.0 + netstandard2.1 @@ -10,14 +11,10 @@ - - - - - - - - + + + + diff --git a/src/Orleans.Persistence.Redis/Orleans.Persistence.Redis.csproj b/src/Orleans.Persistence.Redis/Orleans.Persistence.Redis.csproj index c533618..8de07c1 100644 --- a/src/Orleans.Persistence.Redis/Orleans.Persistence.Redis.csproj +++ b/src/Orleans.Persistence.Redis/Orleans.Persistence.Redis.csproj @@ -1,7 +1,8 @@  + - netstandard2.0 + netstandard2.1 @@ -10,13 +11,9 @@ - - - - - - - + + + diff --git a/src/Orleans.Reminders.Redis/Orleans.Reminders.Redis.csproj b/src/Orleans.Reminders.Redis/Orleans.Reminders.Redis.csproj index cb34bd2..df434dd 100644 --- a/src/Orleans.Reminders.Redis/Orleans.Reminders.Redis.csproj +++ b/src/Orleans.Reminders.Redis/Orleans.Reminders.Redis.csproj @@ -1,7 +1,8 @@ - + + - netstandard2.0 + netstandard2.1 @@ -10,13 +11,9 @@ - - - - - - - + + + diff --git a/test/Orleans.Clustering.Redis.Test/Orleans.Clustering.Redis.Test.csproj b/test/Orleans.Clustering.Redis.Test/Orleans.Clustering.Redis.Test.csproj index 09f7080..523b799 100644 --- a/test/Orleans.Clustering.Redis.Test/Orleans.Clustering.Redis.Test.csproj +++ b/test/Orleans.Clustering.Redis.Test/Orleans.Clustering.Redis.Test.csproj @@ -1,21 +1,22 @@  + - net472;netcoreapp3.1;net5.0 + net5.0;net6.0 latest false - - + + all runtime; build; native; contentfiles; analyzers - - - - + + + + all runtime; build; native; contentfiles; analyzers @@ -26,7 +27,7 @@ - + diff --git a/test/Orleans.Persistence.Redis.TestGrainInterfaces/Orleans.Persistence.Redis.TestGrainInterfaces.csproj b/test/Orleans.Persistence.Redis.TestGrainInterfaces/Orleans.Persistence.Redis.TestGrainInterfaces.csproj index bb08f67..ab1d45b 100644 --- a/test/Orleans.Persistence.Redis.TestGrainInterfaces/Orleans.Persistence.Redis.TestGrainInterfaces.csproj +++ b/test/Orleans.Persistence.Redis.TestGrainInterfaces/Orleans.Persistence.Redis.TestGrainInterfaces.csproj @@ -1,12 +1,13 @@ - + + - netstandard2.0 + netstandard2.1 - - + + all runtime; build; native; contentfiles; analyzers diff --git a/test/Orleans.Persistence.Redis.TestGrains/Orleans.Persistence.Redis.TestGrains.csproj b/test/Orleans.Persistence.Redis.TestGrains/Orleans.Persistence.Redis.TestGrains.csproj index d302de6..3a31155 100644 --- a/test/Orleans.Persistence.Redis.TestGrains/Orleans.Persistence.Redis.TestGrains.csproj +++ b/test/Orleans.Persistence.Redis.TestGrains/Orleans.Persistence.Redis.TestGrains.csproj @@ -1,12 +1,13 @@ - + + - netstandard2.0 + netstandard2.1 - - + + all runtime; build; native; contentfiles; analyzers diff --git a/test/Orleans.Persistence.Redis.Tests/Orleans.Persistence.Redis.Tests.csproj b/test/Orleans.Persistence.Redis.Tests/Orleans.Persistence.Redis.Tests.csproj index 7d8c349..c1d8ac8 100644 --- a/test/Orleans.Persistence.Redis.Tests/Orleans.Persistence.Redis.Tests.csproj +++ b/test/Orleans.Persistence.Redis.Tests/Orleans.Persistence.Redis.Tests.csproj @@ -1,26 +1,27 @@ - + + - net472;netcoreapp3.1;net5.0 + net5.0;net6.0 false - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - + + + + + + + @@ -30,7 +31,7 @@ - + diff --git a/test/Orleans.Reminders.Redis.TestGrainInterfaces/Orleans.Reminders.Redis.TestGrainInterfaces.csproj b/test/Orleans.Reminders.Redis.TestGrainInterfaces/Orleans.Reminders.Redis.TestGrainInterfaces.csproj index bb08f67..ab1d45b 100644 --- a/test/Orleans.Reminders.Redis.TestGrainInterfaces/Orleans.Reminders.Redis.TestGrainInterfaces.csproj +++ b/test/Orleans.Reminders.Redis.TestGrainInterfaces/Orleans.Reminders.Redis.TestGrainInterfaces.csproj @@ -1,12 +1,13 @@ - + + - netstandard2.0 + netstandard2.1 - - + + all runtime; build; native; contentfiles; analyzers diff --git a/test/Orleans.Reminders.Redis.TestGrains/Orleans.Reminders.Redis.TestGrains.csproj b/test/Orleans.Reminders.Redis.TestGrains/Orleans.Reminders.Redis.TestGrains.csproj index e460db6..a2772ec 100644 --- a/test/Orleans.Reminders.Redis.TestGrains/Orleans.Reminders.Redis.TestGrains.csproj +++ b/test/Orleans.Reminders.Redis.TestGrains/Orleans.Reminders.Redis.TestGrains.csproj @@ -1,12 +1,13 @@  + - netstandard2.0 + netstandard2.1 - - + + all runtime; build; native; contentfiles; analyzers diff --git a/test/Orleans.Reminders.Redis.Tests/Orleans.Reminders.Redis.Tests.csproj b/test/Orleans.Reminders.Redis.Tests/Orleans.Reminders.Redis.Tests.csproj index 51f188d..a0629d8 100644 --- a/test/Orleans.Reminders.Redis.Tests/Orleans.Reminders.Redis.Tests.csproj +++ b/test/Orleans.Reminders.Redis.Tests/Orleans.Reminders.Redis.Tests.csproj @@ -1,26 +1,27 @@ - + + - net472;netcoreapp3.1;net5.0 + net5.0;net6.0 false - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - + + + + + + + @@ -30,7 +31,7 @@ - +