This is an automated email from the ASF dual-hosted git repository.
tabish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-proton-dotnet.git
The following commit(s) were added to refs/heads/main by this push:
new b18b737 PROTON-2560 Allow tests and examples builds to roll forward
by default
b18b737 is described below
commit b18b73702c015fea1833bd597cacb912a2064207
Author: Timothy Bish <tabish...@gmail.com>
AuthorDate: Wed Jun 8 16:01:00 2022 -0400
PROTON-2560 Allow tests and examples builds to roll forward by default
Allows the executable outputs of the tests and examples projects to roll
forward to the next major release of .NET framework to allow for builds
to find the installed framework
---
.github/workflows/dotnet.yml | 4 +---
common.props | 4 ++++
examples/Example.HelloWorld/Example.HelloWorld.csproj | 1 +
.../Example.LargeMessageReceiver/Example.LargeMessageReceiver.csproj | 1 +
examples/Example.LargeMessageSender/Example.LargeMessageSender.csproj | 1 +
examples/Example.NextReceiver/Example.NextReceiver.csproj | 1 +
examples/Example.Receive/Example.Receive.csproj | 1 +
examples/Example.ReconnectReceiver/Example.ReconnectReceiver.csproj | 1 +
examples/Example.ReconnectSender/Example.ReconnectSender.csproj | 1 +
examples/Example.Request/Example.Request.csproj | 1 +
examples/Example.Respond/Example.Respond.csproj | 1 +
examples/Example.Send/Example.Send.csproj | 1 +
.../Example.StreamingFileReceiver.csproj | 1 +
.../Example.StreamingFileSender/Example.StreamingFileSender.csproj | 1 +
examples/Example.TransactedReceiver/Example.TransactedReceiver.csproj | 1 +
examples/Example.TransactedSender/Example.TransactedSender.csproj | 1 +
test/Proton.Client.Tests/Proton.Client.Tests.csproj | 1 +
test/Proton.TestPeer.Tests/Proton.TestPeer.Tests.csproj | 1 +
test/Proton.Tests/Proton.Tests.csproj | 1 +
19 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index c39bee0..4c94e5d 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -16,9 +16,7 @@ jobs:
- name: Setup .NET 6
uses: actions/setup-dotnet@v2
with:
- dotnet-version: |
- 6.0.x
- 5.0.x
+ dotnet-version: 6.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build
diff --git a/common.props b/common.props
index d56faac..3ead60e 100644
--- a/common.props
+++ b/common.props
@@ -44,6 +44,10 @@
<DefaultLibraryTargetFrameworks>$(DefaultTargetFrameworkVersion)</DefaultLibraryTargetFrameworks>
<!-- Unit Tests -->
<DefaultUnitTestTargetFrameworks>$(DefaultTargetFrameworkVersion)</DefaultUnitTestTargetFrameworks>
+ <!-- Rolling policies-->
+ <DefaultRollForwardPolicy>LatestMajor</DefaultRollForwardPolicy>
+
<DefaultExeRollForwardPolicy>$(DefaultRollForwardPolicy)</DefaultExeRollForwardPolicy>
+
<DefaultUnitTestsRollForwardPolicy>$(DefaultRollForwardPolicy)</DefaultUnitTestsRollForwardPolicy>
</PropertyGroup>
<PropertyGroup Label="Common NuGet Properties">
diff --git a/examples/Example.HelloWorld/Example.HelloWorld.csproj
b/examples/Example.HelloWorld/Example.HelloWorld.csproj
index edd731c..d760cea 100644
--- a/examples/Example.HelloWorld/Example.HelloWorld.csproj
+++ b/examples/Example.HelloWorld/Example.HelloWorld.csproj
@@ -20,6 +20,7 @@
<PropertyGroup>
<TargetFramework>$(DefaultExeTargetFrameworks)</TargetFramework>
+ <RollForward>$(DefaultExeRollForwardPolicy)</RollForward>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git
a/examples/Example.LargeMessageReceiver/Example.LargeMessageReceiver.csproj
b/examples/Example.LargeMessageReceiver/Example.LargeMessageReceiver.csproj
index edd731c..d760cea 100644
--- a/examples/Example.LargeMessageReceiver/Example.LargeMessageReceiver.csproj
+++ b/examples/Example.LargeMessageReceiver/Example.LargeMessageReceiver.csproj
@@ -20,6 +20,7 @@
<PropertyGroup>
<TargetFramework>$(DefaultExeTargetFrameworks)</TargetFramework>
+ <RollForward>$(DefaultExeRollForwardPolicy)</RollForward>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git
a/examples/Example.LargeMessageSender/Example.LargeMessageSender.csproj
b/examples/Example.LargeMessageSender/Example.LargeMessageSender.csproj
index edd731c..d760cea 100644
--- a/examples/Example.LargeMessageSender/Example.LargeMessageSender.csproj
+++ b/examples/Example.LargeMessageSender/Example.LargeMessageSender.csproj
@@ -20,6 +20,7 @@
<PropertyGroup>
<TargetFramework>$(DefaultExeTargetFrameworks)</TargetFramework>
+ <RollForward>$(DefaultExeRollForwardPolicy)</RollForward>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/examples/Example.NextReceiver/Example.NextReceiver.csproj
b/examples/Example.NextReceiver/Example.NextReceiver.csproj
index edd731c..d760cea 100644
--- a/examples/Example.NextReceiver/Example.NextReceiver.csproj
+++ b/examples/Example.NextReceiver/Example.NextReceiver.csproj
@@ -20,6 +20,7 @@
<PropertyGroup>
<TargetFramework>$(DefaultExeTargetFrameworks)</TargetFramework>
+ <RollForward>$(DefaultExeRollForwardPolicy)</RollForward>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/examples/Example.Receive/Example.Receive.csproj
b/examples/Example.Receive/Example.Receive.csproj
index edd731c..d760cea 100644
--- a/examples/Example.Receive/Example.Receive.csproj
+++ b/examples/Example.Receive/Example.Receive.csproj
@@ -20,6 +20,7 @@
<PropertyGroup>
<TargetFramework>$(DefaultExeTargetFrameworks)</TargetFramework>
+ <RollForward>$(DefaultExeRollForwardPolicy)</RollForward>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git
a/examples/Example.ReconnectReceiver/Example.ReconnectReceiver.csproj
b/examples/Example.ReconnectReceiver/Example.ReconnectReceiver.csproj
index edd731c..d760cea 100644
--- a/examples/Example.ReconnectReceiver/Example.ReconnectReceiver.csproj
+++ b/examples/Example.ReconnectReceiver/Example.ReconnectReceiver.csproj
@@ -20,6 +20,7 @@
<PropertyGroup>
<TargetFramework>$(DefaultExeTargetFrameworks)</TargetFramework>
+ <RollForward>$(DefaultExeRollForwardPolicy)</RollForward>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/examples/Example.ReconnectSender/Example.ReconnectSender.csproj
b/examples/Example.ReconnectSender/Example.ReconnectSender.csproj
index edd731c..d760cea 100644
--- a/examples/Example.ReconnectSender/Example.ReconnectSender.csproj
+++ b/examples/Example.ReconnectSender/Example.ReconnectSender.csproj
@@ -20,6 +20,7 @@
<PropertyGroup>
<TargetFramework>$(DefaultExeTargetFrameworks)</TargetFramework>
+ <RollForward>$(DefaultExeRollForwardPolicy)</RollForward>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/examples/Example.Request/Example.Request.csproj
b/examples/Example.Request/Example.Request.csproj
index edd731c..d760cea 100644
--- a/examples/Example.Request/Example.Request.csproj
+++ b/examples/Example.Request/Example.Request.csproj
@@ -20,6 +20,7 @@
<PropertyGroup>
<TargetFramework>$(DefaultExeTargetFrameworks)</TargetFramework>
+ <RollForward>$(DefaultExeRollForwardPolicy)</RollForward>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/examples/Example.Respond/Example.Respond.csproj
b/examples/Example.Respond/Example.Respond.csproj
index edd731c..d760cea 100644
--- a/examples/Example.Respond/Example.Respond.csproj
+++ b/examples/Example.Respond/Example.Respond.csproj
@@ -20,6 +20,7 @@
<PropertyGroup>
<TargetFramework>$(DefaultExeTargetFrameworks)</TargetFramework>
+ <RollForward>$(DefaultExeRollForwardPolicy)</RollForward>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/examples/Example.Send/Example.Send.csproj
b/examples/Example.Send/Example.Send.csproj
index edd731c..d760cea 100644
--- a/examples/Example.Send/Example.Send.csproj
+++ b/examples/Example.Send/Example.Send.csproj
@@ -20,6 +20,7 @@
<PropertyGroup>
<TargetFramework>$(DefaultExeTargetFrameworks)</TargetFramework>
+ <RollForward>$(DefaultExeRollForwardPolicy)</RollForward>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git
a/examples/Example.StreamingFileReceiver/Example.StreamingFileReceiver.csproj
b/examples/Example.StreamingFileReceiver/Example.StreamingFileReceiver.csproj
index edd731c..d760cea 100644
---
a/examples/Example.StreamingFileReceiver/Example.StreamingFileReceiver.csproj
+++
b/examples/Example.StreamingFileReceiver/Example.StreamingFileReceiver.csproj
@@ -20,6 +20,7 @@
<PropertyGroup>
<TargetFramework>$(DefaultExeTargetFrameworks)</TargetFramework>
+ <RollForward>$(DefaultExeRollForwardPolicy)</RollForward>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git
a/examples/Example.StreamingFileSender/Example.StreamingFileSender.csproj
b/examples/Example.StreamingFileSender/Example.StreamingFileSender.csproj
index edd731c..d760cea 100644
--- a/examples/Example.StreamingFileSender/Example.StreamingFileSender.csproj
+++ b/examples/Example.StreamingFileSender/Example.StreamingFileSender.csproj
@@ -20,6 +20,7 @@
<PropertyGroup>
<TargetFramework>$(DefaultExeTargetFrameworks)</TargetFramework>
+ <RollForward>$(DefaultExeRollForwardPolicy)</RollForward>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git
a/examples/Example.TransactedReceiver/Example.TransactedReceiver.csproj
b/examples/Example.TransactedReceiver/Example.TransactedReceiver.csproj
index edd731c..d760cea 100644
--- a/examples/Example.TransactedReceiver/Example.TransactedReceiver.csproj
+++ b/examples/Example.TransactedReceiver/Example.TransactedReceiver.csproj
@@ -20,6 +20,7 @@
<PropertyGroup>
<TargetFramework>$(DefaultExeTargetFrameworks)</TargetFramework>
+ <RollForward>$(DefaultExeRollForwardPolicy)</RollForward>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/examples/Example.TransactedSender/Example.TransactedSender.csproj
b/examples/Example.TransactedSender/Example.TransactedSender.csproj
index edd731c..d760cea 100644
--- a/examples/Example.TransactedSender/Example.TransactedSender.csproj
+++ b/examples/Example.TransactedSender/Example.TransactedSender.csproj
@@ -20,6 +20,7 @@
<PropertyGroup>
<TargetFramework>$(DefaultExeTargetFrameworks)</TargetFramework>
+ <RollForward>$(DefaultExeRollForwardPolicy)</RollForward>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/test/Proton.Client.Tests/Proton.Client.Tests.csproj
b/test/Proton.Client.Tests/Proton.Client.Tests.csproj
index b9f9058..254e187 100644
--- a/test/Proton.Client.Tests/Proton.Client.Tests.csproj
+++ b/test/Proton.Client.Tests/Proton.Client.Tests.csproj
@@ -20,6 +20,7 @@
<PropertyGroup>
<TargetFramework>$(DefaultUnitTestTargetFrameworks)</TargetFramework>
+ <RollForward>$(DefaultUnitTestsRollForwardPolicy)</RollForward>
<AssemblyName>Qpid.Proton.Client.Tests</AssemblyName>
<RootNamespace>Apache.Qpid.Proton.Client</RootNamespace>
<SignAssembly>true</SignAssembly>
diff --git a/test/Proton.TestPeer.Tests/Proton.TestPeer.Tests.csproj
b/test/Proton.TestPeer.Tests/Proton.TestPeer.Tests.csproj
index 77eea6c..ad95d48 100644
--- a/test/Proton.TestPeer.Tests/Proton.TestPeer.Tests.csproj
+++ b/test/Proton.TestPeer.Tests/Proton.TestPeer.Tests.csproj
@@ -20,6 +20,7 @@
<PropertyGroup>
<TargetFramework>$(DefaultUnitTestTargetFrameworks)</TargetFramework>
+ <RollForward>$(DefaultUnitTestsRollForwardPolicy)</RollForward>
<IsPackable>false</IsPackable>
<RootNamespace>Apache.Qpid.Proton</RootNamespace>
<AssemblyName>Qpid.Proton.TestPeer.Tests</AssemblyName>
diff --git a/test/Proton.Tests/Proton.Tests.csproj
b/test/Proton.Tests/Proton.Tests.csproj
index e72b411..0ea0bc0 100644
--- a/test/Proton.Tests/Proton.Tests.csproj
+++ b/test/Proton.Tests/Proton.Tests.csproj
@@ -26,6 +26,7 @@
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateProgramFile>true</GenerateProgramFile>
<CodeAnalysisRuleSet>..\..\Proton.ruleset</CodeAnalysisRuleSet>
+ <RollForward>$(DefaultUnitTestsRollForwardPolicy)</RollForward>
</PropertyGroup>
<ItemGroup>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
