AMQNET-637 Merge outstanding changes from apache master - with conflicts
diff --git a/.travis.yml b/.travis.yml
index 1c04b32..7027cec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
language: csharp
solution: apache-nms-amqp.sln
mono: none
-dotnet: 2.2.401
+dotnet: 2.1
script:
- - dotnet build -p:AppTargetFramework=netcoreapp2.2 -c Release
- - dotnet test ./test/Apache-NMS-AMQP-Test/Apache-NMS-AMQP-Test.csproj -f netcoreapp2.2 -c Release --filter Category!=Windows
\ No newline at end of file
+ - dotnet build -p:AppTargetFramework=netcoreapp2.1 -c Release
+ - dotnet test ./test/Apache-NMS-AMQP-Test/Apache-NMS-AMQP-Test.csproj -f netcoreapp2.1 -c Release --filter Category!=Windows
\ No newline at end of file
diff --git a/package.ps1 b/package.ps1
index 1bfa635..d1382c5 100644
--- a/package.ps1
+++ b/package.ps1
@@ -34,7 +34,7 @@
write-progress "Packaging Application files." "Scanning..."
$zipfile = "$pkgdir\$pkgname-$pkgver-bin.zip"
- Compress-Archive -Path ..\LICENSE.txt, ..\NOTICE.txt -Update -DestinationPath $zipfile
+ Compress-Archive -Path ..\LICENSE.txt, ..\NOTICE.txt -Update -DestinationPath $zipfile
# clean up temp
Remove-Item temp -Recurse -ErrorAction Ignore
@@ -48,6 +48,10 @@
$nupkgdestination = "$pkgdir\$nupkg"
Copy-Item -Path $nupkg -Destination $nupkgdestination
+ $snupkg = "$pkgname.$pkgver.snupkg"
+ $snupkgdestination = "$pkgdir\$snupkg"
+ Copy-Item -Path $snupkg -Destination $snupkgdestination
+
# clean up temp
Remove-Item temp -Recurse -ErrorAction Inquire
diff --git a/src/HelloWorld/HelloWorld.csproj b/src/HelloWorld/HelloWorld.csproj
index 3e156c1..14b17d0 100644
--- a/src/HelloWorld/HelloWorld.csproj
+++ b/src/HelloWorld/HelloWorld.csproj
@@ -17,7 +17,7 @@
-->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net462;netcoreapp2.2</TargetFrameworks>
+ <TargetFrameworks>net462;netcoreapp2.1</TargetFrameworks>
<TargetFramework Condition="'$(AppTargetFramework)' != ''">$(AppTargetFramework)</TargetFramework>
<OutputType>Exe</OutputType>
<RootNamespace>HelloWorld</RootNamespace>
diff --git a/src/NMS.AMQP/Apache-NMS-AMQP.csproj b/src/NMS.AMQP/Apache-NMS-AMQP.csproj
index ba0f0ee..7f08a9b 100644
--- a/src/NMS.AMQP/Apache-NMS-AMQP.csproj
+++ b/src/NMS.AMQP/Apache-NMS-AMQP.csproj
@@ -48,6 +48,20 @@
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
</PropertyGroup>
+ <!-- SourceLink Start -->
+ <PropertyGroup>
+ <!-- Embed source files that are not tracked by the source control manager in the PDB -->
+ <EmbedUntrackedSources>true</EmbedUntrackedSources>
+ <!-- Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
+ <IncludeSymbols>true</IncludeSymbols>
+ <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+ </PropertyGroup>
+ <ItemGroup>
+ <!-- Add PackageReference specific for your source control provider (see below) -->
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+ </ItemGroup>
+ <!-- SourceLink End -->
+
<ItemGroup>
<None Include="..\..\LICENSE.txt" Pack="true" PackagePath="LICENSE.txt" />
<None Include="..\..\NOTICE.txt" Pack="true" PackagePath="NOTICE.txt" />
diff --git a/src/PingPong/PingPong.csproj b/src/PingPong/PingPong.csproj
index 1e3ab20..38b0af5 100644
--- a/src/PingPong/PingPong.csproj
+++ b/src/PingPong/PingPong.csproj
@@ -18,7 +18,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp2.2</TargetFramework>
+ <TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/src/StructuredMessage/StructuredMessage.csproj b/src/StructuredMessage/StructuredMessage.csproj
index c7c0500..ea92a54 100644
--- a/src/StructuredMessage/StructuredMessage.csproj
+++ b/src/StructuredMessage/StructuredMessage.csproj
@@ -17,7 +17,7 @@
-->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net462;netcoreapp2.2</TargetFrameworks>
+ <TargetFrameworks>net462;netcoreapp2.1</TargetFrameworks>
<TargetFramework Condition="'$(AppTargetFramework)' != ''">$(AppTargetFramework)</TargetFramework>
<OutputType>Exe</OutputType>
<RootNamespace>StructuredMessage</RootNamespace>
diff --git a/src/Transactions/Transactions.csproj b/src/Transactions/Transactions.csproj
index 51f9be8..68b90ff 100644
--- a/src/Transactions/Transactions.csproj
+++ b/src/Transactions/Transactions.csproj
@@ -18,7 +18,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp2.2</TargetFramework>
+ <TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework Condition="'$(AppTargetFramework)' != ''">$(AppTargetFramework)</TargetFramework>
</PropertyGroup>
diff --git a/test/Apache-NMS-AMQP-Interop-Test/Apache-NMS-AMQP-Interop-Test.csproj b/test/Apache-NMS-AMQP-Interop-Test/Apache-NMS-AMQP-Interop-Test.csproj
index abbd2fc..07a722b 100644
--- a/test/Apache-NMS-AMQP-Interop-Test/Apache-NMS-AMQP-Interop-Test.csproj
+++ b/test/Apache-NMS-AMQP-Interop-Test/Apache-NMS-AMQP-Interop-Test.csproj
@@ -16,7 +16,7 @@
-->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
+ <TargetFrameworks>net462;netcoreapp2.1</TargetFrameworks>
<TargetFramework Condition="'$(AppTargetFramework)' != ''">$(AppTargetFramework)</TargetFramework>
<RootNamespace>NMS.AMQP.Test</RootNamespace>
<AssemblyName>NMS.AMQP.Interop.Test</AssemblyName>
diff --git a/test/Apache-NMS-AMQP-Test/Apache-NMS-AMQP-Test.csproj b/test/Apache-NMS-AMQP-Test/Apache-NMS-AMQP-Test.csproj
index 2de2f86..5452060 100644
--- a/test/Apache-NMS-AMQP-Test/Apache-NMS-AMQP-Test.csproj
+++ b/test/Apache-NMS-AMQP-Test/Apache-NMS-AMQP-Test.csproj
@@ -16,7 +16,7 @@
-->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
+ <TargetFrameworks>net462;netcoreapp2.1</TargetFrameworks>
<TargetFramework Condition="'$(AppTargetFramework)' != ''">$(AppTargetFramework)</TargetFramework>
<RootNamespace>NMS.AMQP.Test</RootNamespace>
<AssemblyName>NMS.AMQP.Test</AssemblyName>
