Omit Environment.Version from CodeDom generated files (#35458)

* Omit Environment.Version from CodeDom generated files Contributes to dotnet/coreclr#22664 * Disable tests on .NET Framework
dotnet · Feb 21, 2019 · 89f72f6 · 89f72f6
1 parent 3ec07db
commit 89f72f6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 15 deletions.
diff --git a/src/System.CodeDom/src/Microsoft/CSharp/CSharpCodeGenerator.cs b/src/System.CodeDom/src/Microsoft/CSharp/CSharpCodeGenerator.cs
@@ -2521,9 +2521,6 @@ private void GenerateCompileUnitStart(CodeCompileUnit e)
             Output.WriteLine(SR.AutoGen_Comment_Line1);
             Output.Write("//     ");
             Output.WriteLine(SR.AutoGen_Comment_Line2);
-            Output.Write("//     ");
-            Output.Write(SR.AutoGen_Comment_Line3);
-            Output.WriteLine(Environment.Version.ToString());
             Output.WriteLine("//");
             Output.Write("//     ");
             Output.WriteLine(SR.AutoGen_Comment_Line4);

diff --git a/src/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs b/src/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs
@@ -2183,9 +2183,6 @@ protected override void GenerateCompileUnitStart(CodeCompileUnit e)
             Output.WriteLine(SR.AutoGen_Comment_Line1);
             Output.Write("'     ");
             Output.WriteLine(SR.AutoGen_Comment_Line2);
-            Output.Write("'     ");
-            Output.Write(SR.AutoGen_Comment_Line3);
-            Output.WriteLine(Environment.Version.ToString());
             Output.WriteLine("'");
             Output.Write("'     ");
             Output.WriteLine(SR.AutoGen_Comment_Line4);

diff --git a/src/System.CodeDom/src/Resources/Strings.resx b/src/System.CodeDom/src/Resources/Strings.resx
@@ -119,9 +119,6 @@
   <data name="AutoGen_Comment_Line2" xml:space="preserve">
     <value>This code was generated by a tool.</value>
   </data>
-  <data name="AutoGen_Comment_Line3" xml:space="preserve">
-    <value>Runtime Version:</value>
-  </data>
   <data name="AutoGen_Comment_Line4" xml:space="preserve">
     <value>Changes to this file may cause incorrect behavior and will be lost if</value>
   </data>

diff --git a/src/System.CodeDom/tests/System/CodeDom/Compiler/CSharpCodeGenerationTests.cs b/src/System.CodeDom/tests/System/CodeDom/Compiler/CSharpCodeGenerationTests.cs
@@ -612,6 +612,7 @@ public void Arrays_WithinArrays_Empty_NonPrimitiveTypes()
         }
 
         [Fact]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
         public void MetadataAttributes()
         {
             RemoteInvoke(() =>
@@ -739,7 +740,6 @@ public void MetadataAttributes()
                     @"//------------------------------------------------------------------------------
                       // <auto-generated>
                       //     This code was generated by a tool.
-                      //     Runtime Version:4.0.30319.42000
                       //
                       //     Changes to this file may cause incorrect behavior and will be lost if
                       //     the code is regenerated.
@@ -1449,6 +1449,7 @@ public struct structC {
         }
 
         [Fact]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
         public void RegionsSnippetsAndLinePragmas()
         {
             RemoteInvoke(() =>
@@ -1630,7 +1631,6 @@ public void RegionsSnippetsAndLinePragmas()
                       //------------------------------------------------------------------------------
                       // <auto-generated>
                       //     This code was generated by a tool.
-                      //     Runtime Version:4.0.30319.42000
                       //
                       //     Changes to this file may cause incorrect behavior and will be lost if
                       //     the code is regenerated.
@@ -2571,6 +2571,7 @@ public int TestMethod03() {
         }
 
         [Fact]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
         public void ProviderSupports()
         {
             RemoteInvoke(() =>
@@ -3125,7 +3126,6 @@ public void ProviderSupports()
                     @"//------------------------------------------------------------------------------
                       // <auto-generated>
                       //     This code was generated by a tool.
-                      //     Runtime Version:4.0.30319.42000
                       //
                       //     Changes to this file may cause incorrect behavior and will be lost if
                       //     the code is regenerated.

diff --git a/src/System.CodeDom/tests/System/CodeDom/Compiler/VBCodeGenerationTests.cs b/src/System.CodeDom/tests/System/CodeDom/Compiler/VBCodeGenerationTests.cs
@@ -578,6 +578,7 @@ Return arrayType(1).number
         }
 
         [Fact]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
         public void MetadataAttributes()
         {
             RemoteInvoke(() =>
@@ -705,7 +706,6 @@ public void MetadataAttributes()
                     @"'------------------------------------------------------------------------------
                       ' <auto-generated>
                       '     This code was generated by a tool.
-                      '     Runtime Version:4.0.30319.42000
                       '
                       '     Changes to this file may cause incorrect behavior and will be lost if
                       '     the code is regenerated.
@@ -1399,6 +1399,7 @@ End Class
         }
 
         [Fact]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
         public void RegionsSnippetsAndLinePragmas()
         {
             RemoteInvoke(() =>
@@ -1580,7 +1581,6 @@ public void RegionsSnippetsAndLinePragmas()
                       '------------------------------------------------------------------------------
                       ' <auto-generated>
                       '     This code was generated by a tool.
-                      '     Runtime Version:4.0.30319.42000
                       '
                       '     Changes to this file may cause incorrect behavior and will be lost if
                       '     the code is regenerated.
@@ -2362,6 +2362,7 @@ End Class
         }
 
         [Fact]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
         public void ProviderSupports()
         {
             RemoteInvoke(() =>
@@ -2926,7 +2927,6 @@ public void ProviderSupports()
                     @"'------------------------------------------------------------------------------
                       ' <auto-generated>
                       '     This code was generated by a tool.
-                      '     Runtime Version:4.0.30319.42000
                       '
                       '     Changes to this file may cause incorrect behavior and will be lost if
                       '     the code is regenerated.