Merged PR 4869: Merge vNext into master

Related work items: #18345
preemptive · Apr 30, 2020 · d30c2a5 · d30c2a5
2 parents 27d5b77 + 986bf32
commit d30c2a5
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/GettingStarted/GettingStarted.csproj b/GettingStarted/GettingStarted.csproj
@@ -63,7 +63,7 @@
 
     <!-- Set the location of the Dotfuscator MSBuild targets to import -->
     <!-- Defaults to install location, but can be overridden when calling MSBuild -->
-    <DotfuscatorMSBuildDir Condition="'$(DotfuscatorMSBuildDir)' == ''">$(MSBuildExtensionsPath)\PreEmptive\Dotfuscator\4</DotfuscatorMSBuildDir>
+    <DotfuscatorMSBuildDir Condition="'$(DotfuscatorMSBuildDir)' == ''">$(MSBuildExtensionsPath)\PreEmptive\Dotfuscator\6</DotfuscatorMSBuildDir>
 
     <!-- Generate a default Dotfuscator config file (DotfuscatorConfig.xml) -->
     <!-- TODO: Set this to false after the file is generated by the first local build -->

diff --git a/asp.netcore/EchoApp.csproj b/asp.netcore/EchoApp.csproj
@@ -23,7 +23,7 @@
 
     <!-- Set the location of the Dotfuscator MSBuild targets to import -->
     <!-- Defaults to install location, but can be overridden when calling MSBuild -->
-    <DotfuscatorMSBuildDir Condition="'$(DotfuscatorMSBuildDir)' == ''">$(MSBuildExtensionsPath)\PreEmptive\Dotfuscator\4</DotfuscatorMSBuildDir>
+    <DotfuscatorMSBuildDir Condition="'$(DotfuscatorMSBuildDir)' == ''">$(MSBuildExtensionsPath)\PreEmptive\Dotfuscator\6</DotfuscatorMSBuildDir>
 
     <!-- Generate a default Dotfuscator config file (DotfuscatorConfig.xml) -->
     <!-- TODO: Set this to false after the file is generated by the first local build -->

diff --git a/reflection/ReflectionSample.csproj b/reflection/ReflectionSample.csproj
@@ -53,7 +53,7 @@
 
     <!-- Set the location of the Dotfuscator MSBuild targets to import -->
     <!-- Defaults to install location, but can be overridden when calling MSBuild -->
-    <DotfuscatorMSBuildDir Condition="'$(DotfuscatorMSBuildDir)' == ''">$(MSBuildExtensionsPath)\PreEmptive\Dotfuscator\4</DotfuscatorMSBuildDir>
+    <DotfuscatorMSBuildDir Condition="'$(DotfuscatorMSBuildDir)' == ''">$(MSBuildExtensionsPath)\PreEmptive\Dotfuscator\6</DotfuscatorMSBuildDir>
 
     <!-- Generate a default Dotfuscator config file (DotfuscatorConfig.xml) -->
     <!-- TODO: Set this to false after the file is generated by the first local build -->

diff --git a/reflection/reflection_config.xml b/reflection/reflection_config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!--This config file was generated by Dotfuscator. Please use the Dotfuscator Config Editor to modify.-->
 <!DOCTYPE dotfuscator SYSTEM "http://www.preemptive.com/dotfuscator/dtd/dotfuscator_v2.5.dtd">
 <dotfuscator version="2.3">
   <global>
@@ -32,10 +33,8 @@
     </mapping>
     <referencerulelist />
   </renaming>
-  <sos mergeruntime="true">
-    <option>version:v4</option>
-  </sos>
+  <sos />
   <smartobfuscation>
     <smartobfuscationreport verbosity="all" overwrite="false" />
   </smartobfuscation>
-</dotfuscator>
+</dotfuscator>
diff --git a/serialization/SerializationSample.csproj b/serialization/SerializationSample.csproj
@@ -52,7 +52,7 @@
 
     <!-- Set the location of the Dotfuscator MSBuild targets to import -->
     <!-- Defaults to install location, but can be overridden when calling MSBuild -->
-    <DotfuscatorMSBuildDir Condition="'$(DotfuscatorMSBuildDir)' == ''">$(MSBuildExtensionsPath)\PreEmptive\Dotfuscator\4</DotfuscatorMSBuildDir>
+    <DotfuscatorMSBuildDir Condition="'$(DotfuscatorMSBuildDir)' == ''">$(MSBuildExtensionsPath)\PreEmptive\Dotfuscator\6</DotfuscatorMSBuildDir>
 
     <!-- Generate a default Dotfuscator config file (DotfuscatorConfig.xml) -->
     <!-- TODO: Set this to false after the file is generated by the first local build -->

diff --git a/serialization/serialization_config.xml b/serialization/serialization_config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!--This config file was generated by Dotfuscator. Please use the Dotfuscator Config Editor to modify.-->
 <!DOCTYPE dotfuscator SYSTEM "http://www.preemptive.com/dotfuscator/dtd/dotfuscator_v2.5.dtd">
 <dotfuscator version="2.3">
   <global>
@@ -32,10 +33,8 @@
     </mapping>
     <referencerulelist />
   </renaming>
-  <sos mergeruntime="true">
-    <option>version:v4</option>
-  </sos>
+  <sos />
   <smartobfuscation>
     <smartobfuscationreport verbosity="all" overwrite="false" />
   </smartobfuscation>
-</dotfuscator>
+</dotfuscator>