update name of generated file to not collide with existing directory

99386c23 · Brett V. Forsgren · 6ca6dd55 · 99386c23 · 99386c23
Showing with 5 addition and 8 deletion

fcs/Directory.Build.targets fcs/Directory.Build.targets +4 -7

tests/EndToEndBuildTests/ComboProvider/ComboProvider.Tests/ComboProvider.Tests.fsproj ...boProvider/ComboProvider.Tests/ComboProvider.Tests.fsproj +1 -1

未找到文件。
--- a/fcs/Directory.Build.targets
+++ b/fcs/Directory.Build.targets
@@ -29,7 +29,7 @@
  </Target>

  <Target Name="_GenerateBuildPropertiesFile"
-          Outputs="$(IntermediateOutputPath)$(ProjectName)\buildproperties.fs"
+          Outputs="$(IntermediateOutputPath)$(ProjectName).BuildProperties.fs"
          BeforeTargets="BeforeBuild"
          Condition="'$(Language)'=='F#'">

@@ -44,15 +44,12 @@
      <_BuildPropertyLines Include="let fsLanguageVersion = &quot;$(FSLANGUAGEVERSION)&quot;" />
    </ItemGroup>

-    <MakeDir
-      Directories="$(IntermediateOutputPath)$(ProjectName)"
-      Condition="!Exists('$(IntermediateOutputPath)$(ProjectName)')" />
-    <WriteLinesToFile File="$(IntermediateOutputPath)$(ProjectName)\buildproperties.fs" Lines="@(_BuildPropertyLines)" Overwrite="true"  WriteOnlyWhenDifferent="true" />
+    <WriteLinesToFile File="$(IntermediateOutputPath)$(ProjectName).BuildProperties.fs" Lines="@(_BuildPropertyLines)" Overwrite="true"  WriteOnlyWhenDifferent="true" />

    <!-- Make sure it will get cleaned  -->
    <ItemGroup>
-      <FileWrites Include="$(IntermediateOutputPath)$(ProjectName)\buildproperties.fs" />
-      <CompileBefore Include="$(IntermediateOutputPath)$(ProjectName)\buildproperties.fs" />
+      <FileWrites Include="$(IntermediateOutputPath)$(ProjectName).BuildProperties.fs" />
+      <CompileBefore Include="$(IntermediateOutputPath)$(ProjectName).BuildProperties.fs" />
    </ItemGroup>
  </Target>


--- a/tests/EndToEndBuildTests/ComboProvider/ComboProvider.Tests/ComboProvider.Tests.fsproj
+++ b/tests/EndToEndBuildTests/ComboProvider/ComboProvider.Tests/ComboProvider.Tests.fsproj
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Library</OutputType>
-    <TargetFramework Condition=" '$(TestTargetFramework)' == '' ">3.0</TargetFramework>
+    <TargetFramework Condition=" '$(TestTargetFramework)' == '' ">netcoreapp3.0</TargetFramework>
    <TargetFramework Condition=" '$(TestTargetFramework)' != '' ">$(TestTargetFramework)</TargetFramework>
    <IsPackable>false</IsPackable>
    <DefineConstants>NO_GENERATIVE</DefineConstants>