[Build] Cleanup build and packaging files (#513)

diff --git a/build/GlobalSuppressions.cs b/build/GlobalSuppressions.cs
index 99c136f..f66a5fd 100644 (file)
--- a/build/GlobalSuppressions.cs
+++ b/build/GlobalSuppressions.cs
@@ -6,6 +6,6 @@
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1033:Interface methods should be callable by child types")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1060:Move pinvokes to native methods class")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1030:Use events where appropriate")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Major Bug", "S3903:Types should be defined in named namespaces", Scope = "type", Target = "~T:Interop")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1822:Mark members as static")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Major Code Smell", "S125:Sections of code should not be commented out")]
-
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Major Bug", "S3903:Types should be defined in named namespaces", Scope = "type", Target = "~T:Interop")]

diff --git a/build/analyzers.props b/build/analyzers.props
index 23a35fc..4383d27 100644 (file)
--- a/build/analyzers.props
+++ b/build/analyzers.props
@@ -1,7 +1,7 @@
 <Project>
 
   <ItemGroup >
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec
index a419f8a..e4136ea 100644 (file)
--- a/packaging/csapi-tizenfx.spec
+++ b/packaging/csapi-tizenfx.spec
@@ -3,7 +3,6 @@
 %define TIZEN_NET_API_VERSION 5
 %define TIZEN_NET_RPM_VERSION 5.0.0.999+nui504
 %define TIZEN_NET_NUGET_VERSION 5.0.0.99999
-%define TIZEN_NET_INTERNAL_NUGET_VERSION 5.0.0.999
 
 %define DOTNET_ASSEMBLY_PATH /usr/share/dotnet.tizen/framework
 %define DOTNET_ASSEMBLY_DUMMY_PATH %{DOTNET_ASSEMBLY_PATH}/ref
@@ -148,7 +147,7 @@ rm -fr %{_tizenfx_bin_path}
 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
 ./build.sh --full
 ./build.sh --dummy
-./build.sh --pack %{TIZEN_NET_NUGET_VERSION} %{TIZEN_NET_INTERNAL_NUGET_VERSION}
+./build.sh --pack %{TIZEN_NET_NUGET_VERSION}
 
 %install
 mkdir -p %{buildroot}%{DOTNET_ASSEMBLY_PATH}
@@ -163,8 +162,6 @@ install -p -m 644 %{_tizenfx_bin_path}/bin/internal/*.dll %{buildroot}%{DOTNET_A
 # Install Debug Symbols
 install -p -m 644 %{_tizenfx_bin_path}/bin/public/*.pdb %{buildroot}%{DOTNET_ASSEMBLY_PATH}
 install -p -m 644 %{_tizenfx_bin_path}/bin/internal/*.pdb %{buildroot}%{DOTNET_ASSEMBLY_PATH}
-[ -d %{_tizenfx_bin_path}/bin/external ] \
-  && install -p -m 644 %{_tizenfx_bin_path}/bin/external/*.pdb %{buildroot}%{DOTNET_ASSEMBLY_PATH}
 
 # Install Resource files
 [ -d %{_tizenfx_bin_path}/bin/public/res ] \
@@ -197,6 +194,7 @@ install -p -m 644 %{_tizenfx_bin_path}/*.nupkg %{buildroot}%{DOTNET_NUGET_SOURCE
 %attr(644,root,root) %{DOTNET_ASSEMBLY_RES_PATH}/*
 
 %files debug
+%manifest %{name}.manifest
 %attr(644,root,root) %{DOTNET_ASSEMBLY_PATH}/*.pdb
 
 %files common -f common.filelist

diff --git a/packaging/csapi-tizenfx.spec.in b/packaging/csapi-tizenfx.spec.in
index 990f5e7..b0e3bf4 100644 (file)
--- a/packaging/csapi-tizenfx.spec.in
+++ b/packaging/csapi-tizenfx.spec.in
@@ -2,7 +2,6 @@
 %define TIZEN_NET_API_VERSION @api_version@
 %define TIZEN_NET_RPM_VERSION @rpm_version@
 %define TIZEN_NET_NUGET_VERSION @nuget_version@
-%define TIZEN_NET_INTERNAL_NUGET_VERSION @internal_nuget_version@
 
 %define DOTNET_ASSEMBLY_PATH /usr/share/dotnet.tizen/framework
 %define DOTNET_ASSEMBLY_DUMMY_PATH %{DOTNET_ASSEMBLY_PATH}/ref
@@ -147,7 +146,7 @@ rm -fr %{_tizenfx_bin_path}
 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
 ./build.sh --full
 ./build.sh --dummy
-./build.sh --pack %{TIZEN_NET_NUGET_VERSION} %{TIZEN_NET_INTERNAL_NUGET_VERSION}
+./build.sh --pack %{TIZEN_NET_NUGET_VERSION}
 
 %install
 mkdir -p %{buildroot}%{DOTNET_ASSEMBLY_PATH}
@@ -162,8 +161,6 @@ install -p -m 644 %{_tizenfx_bin_path}/bin/internal/*.dll %{buildroot}%{DOTNET_A
 # Install Debug Symbols
 install -p -m 644 %{_tizenfx_bin_path}/bin/public/*.pdb %{buildroot}%{DOTNET_ASSEMBLY_PATH}
 install -p -m 644 %{_tizenfx_bin_path}/bin/internal/*.pdb %{buildroot}%{DOTNET_ASSEMBLY_PATH}
-[ -d %{_tizenfx_bin_path}/bin/external ] \
-  && install -p -m 644 %{_tizenfx_bin_path}/bin/external/*.pdb %{buildroot}%{DOTNET_ASSEMBLY_PATH}
 
 # Install Resource files
 [ -d %{_tizenfx_bin_path}/bin/public/res ] \

diff --git a/packaging/makespec.sh b/packaging/makespec.sh
index d5edbb6..6a57f61 100755 (executable)
--- a/packaging/makespec.sh
+++ b/packaging/makespec.sh
@@ -9,11 +9,10 @@ RPMSPEC_IN=$RPMSPEC.in
 
 source $VERSION_FILE
 
-while getopts ":r:n:i:" opt; do
+while getopts ":r:n:" opt; do
   case $opt in
     r) RPM_VERSION=$OPTARG ;;
     n) NUGET_VERSION=$OPTARG ;;
-    i) INTERNAL_NUGET_VERSION=$OPTARG ;;
     :) echo "Option -$OPTARG requires an argument."; exit 1 ;;
   esac
 done
@@ -25,4 +24,3 @@ echo "# Auto-generated from $(basename $RPMSPEC_IN) by makespec.sh" | cat - $RPM
 sed -i -e "s/@api_version@/$API_VERSION/g" $RPMSPEC
 sed -i -e "s/@rpm_version@/$RPM_VERSION/g" $RPMSPEC
 sed -i -e "s/@nuget_version@/$NUGET_VERSION/g" $RPMSPEC
-sed -i -e "s/@internal_nuget_version@/$INTERNAL_NUGET_VERSION/g" $RPMSPEC

diff --git a/packaging/version.txt b/packaging/version.txt
index 89bf9ef..4b15cb1 100755 (executable)
--- a/packaging/version.txt
+++ b/packaging/version.txt
@@ -4,7 +4,6 @@ API_VERSION=5
 # Default Versions (will be replaced by CI)
 RPM_VERSION=5.0.0.999
 NUGET_VERSION=5.0.0.99999
-INTERNAL_NUGET_VERSION=5.0.0.999
 
 # RPM Version Suffix
 RPM_VERSION_SUFFIX=nui504