diff --git a/Microsoft.Azure.Amqp.Android/Microsoft.Azure.Amqp.Android.csproj b/Microsoft.Azure.Amqp.Android/Microsoft.Azure.Amqp.Android.csproj
index 9475804e..83479eb7 100644
--- a/Microsoft.Azure.Amqp.Android/Microsoft.Azure.Amqp.Android.csproj
+++ b/Microsoft.Azure.Amqp.Android/Microsoft.Azure.Amqp.Android.csproj
@@ -16,6 +16,7 @@
Off
True
v6.0
+ CS1734,CS1591
true
diff --git a/Microsoft.Azure.Amqp.PCL/Microsoft.Azure.Amqp.PCL.csproj b/Microsoft.Azure.Amqp.PCL/Microsoft.Azure.Amqp.PCL.csproj
index 4a21e436..c3e5cb9f 100644
--- a/Microsoft.Azure.Amqp.PCL/Microsoft.Azure.Amqp.PCL.csproj
+++ b/Microsoft.Azure.Amqp.PCL/Microsoft.Azure.Amqp.PCL.csproj
@@ -15,6 +15,7 @@
{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
Profile111
v4.5
+ CS1734,CS1591
true
diff --git a/Microsoft.Azure.Amqp.Uwp/Microsoft.Azure.Amqp.Uwp.csproj b/Microsoft.Azure.Amqp.Uwp/Microsoft.Azure.Amqp.Uwp.csproj
index 7a99677c..48567778 100644
--- a/Microsoft.Azure.Amqp.Uwp/Microsoft.Azure.Amqp.Uwp.csproj
+++ b/Microsoft.Azure.Amqp.Uwp/Microsoft.Azure.Amqp.Uwp.csproj
@@ -16,6 +16,7 @@
14
512
{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ CS1734,CS1591
AnyCPU
@@ -45,7 +46,6 @@
true
bin\x86\Debug\
TRACE;DEBUG;WINDOWS_UWP
- ;2008
full
x86
false
@@ -57,7 +57,6 @@
bin\x86\Release\
TRACE;WINDOWS_UWP
true
- ;2008
pdbonly
x86
false
@@ -69,7 +68,6 @@
true
bin\ARM\Debug\
TRACE;DEBUG;WINDOWS_UWP
- ;2008
full
ARM
false
@@ -81,7 +79,6 @@
bin\ARM\Release\
TRACE;WINDOWS_UWP
true
- ;2008
pdbonly
ARM
false
@@ -93,7 +90,6 @@
true
bin\x64\Debug\
TRACE;DEBUG;WINDOWS_UWP
- ;2008
full
x64
false
@@ -105,7 +101,6 @@
bin\x64\Release\
TRACE;WINDOWS_UWP
true
- ;2008
pdbonly
x64
false
@@ -694,7 +689,6 @@
TRACE;WINDOWS_UWP
true
true
- ;2008
true
pdbonly
x86
@@ -707,7 +701,6 @@
TRACE;WINDOWS_UWP
true
true
- ;2008
true
pdbonly
ARM
@@ -720,7 +713,6 @@
TRACE;WINDOWS_UWP
true
true
- ;2008
true
pdbonly
x64
diff --git a/Microsoft.Azure.Amqp/Microsoft.Azure.Amqp.csproj b/Microsoft.Azure.Amqp/Microsoft.Azure.Amqp.csproj
index 9e2d3d8d..2caa4156 100644
--- a/Microsoft.Azure.Amqp/Microsoft.Azure.Amqp.csproj
+++ b/Microsoft.Azure.Amqp/Microsoft.Azure.Amqp.csproj
@@ -5,7 +5,7 @@
2.0.0
microsoft
net45;netstandard1.3
- $(NoWarn);1591;1734
+ CS1734,CS1591
true
true
true
@@ -38,6 +38,11 @@
$(DefineConstants);RELEASE_DELAY_SIGN
+ true
+
+
+
+ true
diff --git a/build/build.cmd b/build/build.cmd
index a08599e4..24cb770b 100644
--- a/build/build.cmd
+++ b/build/build.cmd
@@ -68,19 +68,9 @@ if %build-clean%==1 (
call :build-a-solution "%build-root%\microsoft_azure_amqp.sln" "%build-config%" "%build-platform%"
if not !errorlevel!==0 exit /b !errorlevel!
-set dest-path=%build-root%\bin\Payload
-if /I "%build-config%" == "Signed" (
- rd /s /q "%dest-path%"
- mkdir "%dest-path%"
- xcopy "%build-root%\Microsoft.Azure.Amqp\bin\signed\net45\Microsoft.Azure.Amqp.dll" "%dest-path%\lib\net45\" /F
- xcopy "%build-root%\Microsoft.Azure.Amqp\bin\signed\net45\Microsoft.Azure.Amqp.xml" "%dest-path%\lib\net45\" /F
- xcopy "%build-root%\Microsoft.Azure.Amqp\bin\signed\netstandard1.3\Microsoft.Azure.Amqp.dll" "%dest-path%\lib\netstandard1.3\" /F
- xcopy "%build-root%\Microsoft.Azure.Amqp\bin\signed\netstandard1.3\Microsoft.Azure.Amqp.xml" "%dest-path%\lib\netstandard1.3\" /F
- xcopy "%build-root%\Microsoft.Azure.Amqp.Uwp\bin\signed\Microsoft.Azure.Amqp.dll" "%dest-path%\lib\uap10.0\" /F
- xcopy "%build-root%\Microsoft.Azure.Amqp.Uwp\bin\signed\Microsoft.Azure.Amqp.pri" "%dest-path%\lib\uap10.0\" /F
- xcopy "%build-root%\Microsoft.Azure.Amqp.Android\bin\signed\Microsoft.Azure.Amqp.dll" "%dest-path%\lib\monoandroid\" /F
- xcopy "%build-root%\Microsoft.Azure.Amqp.Pcl\bin\signed\Microsoft.Azure.Amqp.dll" "%dest-path%\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10+UAP10\" /F
-)
+if /I "%build-config%" == "Release" call :package %build-root%\bin\Payload
+if /I "%build-config%" == "Signed" call :package %build-root%\bin\Payload
+
rem -----------------------------------------------------------------------------
rem -- done
rem -----------------------------------------------------------------------------
@@ -109,6 +99,20 @@ echo --config ^ [Debug] build configuration (e.g. Debug, Release,
echo --platform ^ [Win32] build platform (e.g. Win32, x64, ...)
goto :eof
+:package
+set dest-path=%1
+rd /s /q "%dest-path%"
+mkdir "%dest-path%"
+xcopy "%build-root%\Microsoft.Azure.Amqp\bin\%build-config%\net45\Microsoft.Azure.Amqp.dll" "%dest-path%\lib\net45\" /F
+xcopy "%build-root%\Microsoft.Azure.Amqp\bin\%build-config%\net45\Microsoft.Azure.Amqp.xml" "%dest-path%\lib\net45\" /F
+xcopy "%build-root%\Microsoft.Azure.Amqp\bin\%build-config%\netstandard1.3\Microsoft.Azure.Amqp.dll" "%dest-path%\lib\netstandard1.3\" /F
+xcopy "%build-root%\Microsoft.Azure.Amqp\bin\%build-config%\netstandard1.3\Microsoft.Azure.Amqp.xml" "%dest-path%\lib\netstandard1.3\" /F
+xcopy "%build-root%\Microsoft.Azure.Amqp.Uwp\bin\%build-config%\Microsoft.Azure.Amqp.dll" "%dest-path%\lib\uap10.0\" /F
+xcopy "%build-root%\Microsoft.Azure.Amqp.Uwp\bin\%build-config%\Microsoft.Azure.Amqp.pri" "%dest-path%\lib\uap10.0\" /F
+xcopy "%build-root%\Microsoft.Azure.Amqp.Android\bin\%build-config%\Microsoft.Azure.Amqp.dll" "%dest-path%\lib\monoandroid\" /F
+xcopy "%build-root%\Microsoft.Azure.Amqp.Pcl\bin\%build-config%\Microsoft.Azure.Amqp.dll" "%dest-path%\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10+UAP10\" /F
+powershell %current-path%\make_nuget_package.ps1
+goto :eof
rem -----------------------------------------------------------------------------
rem -- helper subroutines
diff --git a/test/Test.Microsoft.Amqp.Uwp/Test.Microsoft.Amqp.Uwp.csproj b/test/Test.Microsoft.Amqp.Uwp/Test.Microsoft.Amqp.Uwp.csproj
index d7ed07d4..2f998da3 100644
--- a/test/Test.Microsoft.Amqp.Uwp/Test.Microsoft.Amqp.Uwp.csproj
+++ b/test/Test.Microsoft.Amqp.Uwp/Test.Microsoft.Amqp.Uwp.csproj
@@ -40,7 +40,6 @@
false
prompt
true
- true
true
@@ -63,7 +62,6 @@
false
prompt
true
- true
true
@@ -86,7 +84,6 @@
false
prompt
true
- true
PackageReference
diff --git a/test/TestAmqpBroker/TestAmqpBroker.csproj b/test/TestAmqpBroker/TestAmqpBroker.csproj
index f193f584..36f8489e 100644
--- a/test/TestAmqpBroker/TestAmqpBroker.csproj
+++ b/test/TestAmqpBroker/TestAmqpBroker.csproj
@@ -35,7 +35,7 @@
False
- ..\..\Microsoft.Azure.Amqp\bin\Debug\net45\Microsoft.Azure.Amqp.dll
+ ..\..\Microsoft.Azure.Amqp\bin\$(Configuration)\net45\Microsoft.Azure.Amqp.dll