diff --git a/GPW_Admin/GPW_Admin.csproj b/GPW_Admin/GPW_Admin.csproj index 47f759a..0eacf92 100644 --- a/GPW_Admin/GPW_Admin.csproj +++ b/GPW_Admin/GPW_Admin.csproj @@ -314,9 +314,6 @@ - - - diff --git a/GPW_Admin/GPW_Admin.csproj.user b/GPW_Admin/GPW_Admin.csproj.user index 7ff5e1c..44a4d1c 100644 --- a/GPW_Admin/GPW_Admin.csproj.user +++ b/GPW_Admin/GPW_Admin.csproj.user @@ -6,7 +6,7 @@ enabled false ShowAllFiles - IISDEV + IIS02 diff --git a/GPW_Admin/Properties/PublishProfiles/IIS01.pubxml b/GPW_Admin/Properties/PublishProfiles/IIS01.pubxml index 41fb8f2..ec8edf6 100644 --- a/GPW_Admin/Properties/PublishProfiles/IIS01.pubxml +++ b/GPW_Admin/Properties/PublishProfiles/IIS01.pubxml @@ -48,10 +48,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt True True False - MergeAllOutputsToASingleAssembly - True - GPW_Admin - True + DonotMerge diff --git a/GPW_Admin/Properties/PublishProfiles/IIS02.pubxml b/GPW_Admin/Properties/PublishProfiles/IIS02.pubxml index dd54c20..1da7320 100644 --- a/GPW_Admin/Properties/PublishProfiles/IIS02.pubxml +++ b/GPW_Admin/Properties/PublishProfiles/IIS02.pubxml @@ -48,10 +48,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt True True False - MergeAllOutputsToASingleAssembly - True - GPW_Admin - True + DonotMerge diff --git a/GPW_Admin/Properties/PublishProfiles/IISDEV.pubxml b/GPW_Admin/Properties/PublishProfiles/IISDEV.pubxml index d387180..dfe6e05 100644 --- a/GPW_Admin/Properties/PublishProfiles/IISDEV.pubxml +++ b/GPW_Admin/Properties/PublishProfiles/IISDEV.pubxml @@ -48,10 +48,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt True True False - MergeAllOutputsToASingleAssembly - True - GPW_Admin - True + DonotMerge diff --git a/GPW_Barcode/GPW_Barcode.csproj b/GPW_Barcode/GPW_Barcode.csproj index 52f6fad..6a4719e 100644 --- a/GPW_Barcode/GPW_Barcode.csproj +++ b/GPW_Barcode/GPW_Barcode.csproj @@ -496,9 +496,6 @@ - - - diff --git a/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 1ead8b6..5d1e3c7 100644 Binary files a/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/GPW_Commesse/GPW_Commesse.csproj b/GPW_Commesse/GPW_Commesse.csproj index 6b5eb08..4bcfe20 100644 --- a/GPW_Commesse/GPW_Commesse.csproj +++ b/GPW_Commesse/GPW_Commesse.csproj @@ -332,9 +332,6 @@ - - - diff --git a/GPW_Smart/GPW_Smart.csproj b/GPW_Smart/GPW_Smart.csproj index efaa92c..1798602 100644 --- a/GPW_Smart/GPW_Smart.csproj +++ b/GPW_Smart/GPW_Smart.csproj @@ -511,9 +511,6 @@ - - - diff --git a/GPW_data/GPW_data.csproj b/GPW_data/GPW_data.csproj index 3ab7909..9e6f93b 100644 --- a/GPW_data/GPW_data.csproj +++ b/GPW_data/GPW_data.csproj @@ -251,9 +251,6 @@ - - -