Use WriteCodeFragmentEx everywhere

42422052 · Andy Gocke · 2920f695 · 42422052 · 42422052 · 42422052
3 changed file
--- a/build/Targets/GenerateAssemblyInfo.targets
+++ b/build/Targets/GenerateAssemblyInfo.targets
@@ -68,21 +68,11 @@

    <!-- The necessity of this Task is tracked by https://github.com/dotnet/roslyn/issues/8421 -->
    <WriteCodeFragmentEx 
-        Condition="'$(OS)' == 'Windows_NT'"
        AssemblyAttributes="@(AssemblyVersionAttribute)"
        Language="$(Language)"
        OutputFile="$(GeneratedAssemblyInfoFile)">
      <Output TaskParameter="OutputFile" ItemName="Compile" />
      <Output TaskParameter="OutputFile" ItemName="FileWrites" />
    </WriteCodeFragmentEx>
-
-    <WriteCodeFragment 
-        Condition="'$(OS)' != 'Windows_NT'"
-        AssemblyAttributes="@(AssemblyVersionAttribute)"
-        Language="$(Language)"
-        OutputFile="$(GeneratedAssemblyInfoFile)">
-      <Output TaskParameter="OutputFile" ItemName="Compile" />
-      <Output TaskParameter="OutputFile" ItemName="FileWrites" />
-    </WriteCodeFragment>
  </Target>
 </Project>
--- a/build/Targets/GenerateInternalsVisibleTo.targets
+++ b/build/Targets/GenerateInternalsVisibleTo.targets
@@ -82,7 +82,6 @@
    
    <!-- The necessity of this Task is tracked by https://github.com/dotnet/roslyn/issues/8421 -->
    <WriteCodeFragmentEx 
-        Condition="'$(OS)' == 'Windows_NT'"
        AssemblyAttributes="@(InternalsVisibleToAttribute)"
        Language="$(Language)"
        OutputFile="$(GeneratedInternalsVisibleToFile)">
@@ -90,13 +89,5 @@
      <Output TaskParameter="OutputFile" ItemName="FileWrites" />
    </WriteCodeFragmentEx>

-    <WriteCodeFragment
-        Condition="'$(OS)' != 'Windows_NT'"
-        AssemblyAttributes="@(InternalsVisibleToAttribute)"
-        Language="$(Language)"
-        OutputFile="$(GeneratedInternalsVisibleToFile)">
-      <Output TaskParameter="OutputFile" ItemName="Compile" />
-      <Output TaskParameter="OutputFile" ItemName="FileWrites" />
-    </WriteCodeFragment>
  </Target>
 </Project>
--- a/build/Targets/Settings.targets
+++ b/build/Targets/Settings.targets
@@ -36,8 +36,7 @@
    Bug tracking removing this: https://github.com/dotnet/roslyn/issues/8421
  -->
  <UsingTask TaskName="Roslyn.MSBuild.Util.WriteCodeFragmentEx"
-             AssemblyFile="$(RoslynBuildUtilFilePath)"
-             Condition="'$(OS)' == 'Windows_NT'" />
+             AssemblyFile="$(RoslynBuildUtilFilePath)" />

  <Target Name="RestoreToolsetCheck"
      Condition="'$(BuildingProject)' == 'true'">