From e17d59011ec0c9a6b60a2277221f13dd5ad801d5 Mon Sep 17 00:00:00 2001
From: Jan Kotas <jkotas@microsoft.com>
Date: Wed, 20 Feb 2019 11:24:02 -0800
Subject: [PATCH] Omit Environment.Version from CodeDom generated files

Contributes to https://github.com/dotnet/coreclr/pull/22664
---
 .../src/Microsoft/VisualBasic/VBCodeGenerator.cs               | 3 ---
 src/System.CodeDom/src/Resources/Strings.resx                  | 3 ---
 .../tests/System/CodeDom/Compiler/CSharpCodeGenerationTests.cs | 3 ---
 .../tests/System/CodeDom/Compiler/VBCodeGenerationTests.cs     | 3 ---
 4 files changed, 12 deletions(-)

diff --git a/src/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs b/src/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs
index 6d17b3665825..394c936d8a64 100644
--- 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
index 1547eada5a04..4458b9cd7bd1 100644
--- 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
index b3d06723e214..42799a7d82f2 100644
--- a/src/System.CodeDom/tests/System/CodeDom/Compiler/CSharpCodeGenerationTests.cs
+++ b/src/System.CodeDom/tests/System/CodeDom/Compiler/CSharpCodeGenerationTests.cs
@@ -739,7 +739,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.
@@ -1630,7 +1629,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.
@@ -3125,7 +3123,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
index 3ec43eecbb5f..27db7e5efe2f 100644
--- a/src/System.CodeDom/tests/System/CodeDom/Compiler/VBCodeGenerationTests.cs
+++ b/src/System.CodeDom/tests/System/CodeDom/Compiler/VBCodeGenerationTests.cs
@@ -705,7 +705,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.
@@ -1580,7 +1579,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.
@@ -2926,7 +2924,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.