Skip to content

Revert parameterized product version and update version numbers #8125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Revert parameterized product version and update version numbers #8125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
719673a
Revert "Parameterize product version (#8031)"
brettfo Jan 8, 2020
0b1ac65
update package version numbers
brettfo Jan 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 3 additions & 30 deletions FSharpBuild.Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project>

<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
<Import Project="eng\targets\Imports.targets" />
<Import Project="eng\targets\NuGet.targets" />
Expand All @@ -9,7 +8,7 @@
<Target Name="NoneSubstituteTextFiles"
Inputs="@(NoneSubstituteText)"
Outputs="@(NoneSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')"
BeforeTargets="AssignTargetPaths;BeforeBuild;GenerateFSharpTextResources">
BeforeTargets="AssignTargetPaths;BeforeBuild">

<PropertyGroup>
<__TargetFilePath>@(NoneSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')</__TargetFilePath>
Expand All @@ -21,19 +20,16 @@

<_CopyToOutputDirectory Condition="'%(NoneSubstituteText.CopyToOutputDirectory)' != ''">%(NoneSubstituteText.CopyToOutputDirectory)</_CopyToOutputDirectory>
<_CopyToOutputDirectory Condition="'%(NoneSubstituteText.CopyToOutputDirectory)' == ''">Never</_CopyToOutputDirectory>

<_IncludeInVsix>false</_IncludeInVsix>
<_IncludeInVsix Condition="'%(NoneSubstituteText.IncludeInVsix)' == 'true'">true</_IncludeInVsix>
</PropertyGroup>

<MakeDir Directories="$(IntermediateOutputPath)"
Condition="!Exists('$(IntermediateOutputPath)')" />
<WriteLinesToFile File="$(__TargetFilePath)" Lines="$(_ReplacementText)" Overwrite="true" WriteOnlyWhenDifferent="true" />

<ItemGroup>
<!-- Make sure it will get cleaned -->
<ItemGroup >
<None Include="$(__TargetFilePath)" CopyToOutputDirectory="$(_CopyToOutputDirectory)" />
<FileWrites Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' != 'App.config'" />
<Content Include="$(__TargetFilePath)" CopyToOutputDirectory="Always" IncludeInVsix="true" />
</ItemGroup>
</Target>

Expand Down Expand Up @@ -65,27 +61,4 @@
</ItemGroup>
</Target>

<Target Name="BeforeResGen"
Inputs="@(EmbeddedResource->'$(IntermediateOutputPath)%(Filename)%(Extension)')"
Outputs="@(EmbeddedResource->'$(IntermediateOutputPath)resources\%(Filename)%(Extension)')"
DependsOnTargets="CopyVsixResources"
Condition="'$(Configuration)' != 'Proto' and '$(Language)'=='F#' and '$(DisableCompilerRedirection)' != 'true' ">

<SubstituteText EmbeddedResources="@(EmbeddedResource)">
<Output TaskParameter="CopiedFiles" ItemName="CopiedFiles" />
</SubstituteText>

<ItemGroup>
<EmbeddedResource Remove="@(EmbeddedResource)"/>
<EmbeddedResource Include="@(CopiedFiles)"/>
</ItemGroup>

<MakeDir Directories="$(IntermediateOutputPath)" Condition="!Exists('$(IntermediateOutputPath)')" />
<MakeDir Directories="$(IntermediateOutputPath)resources\" Condition="!Exists('$(IntermediateOutputPath)resources\')" />
</Target>

<Target Name="CopyVsixResources">
<Copy SourceFiles="@(CopyVsixResources)" DestinationFolder="$(IntermediateOutputPath)\resources\Resources" />
</Target>

</Project>
6 changes: 3 additions & 3 deletions fcs/build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,16 @@ Target.create "Build" (fun _ ->
runDotnet __SOURCE_DIRECTORY__ "build" "../src/buildtools/buildtools.proj -v n -c Proto"
let fslexPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fslex/Proto/netcoreapp2.1/fslex.dll"
let fsyaccPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fsyacc/Proto/netcoreapp2.1/fsyacc.dll"
runDotnet __SOURCE_DIRECTORY__ "build" (sprintf "FSharp.Compiler.Service.sln -nodereuse:false -v n -c Release /p:DisableCompilerRedirection=true /p:FsLexPath=%s /p:FsYaccPath=%s" fslexPath fsyaccPath)
runDotnet __SOURCE_DIRECTORY__ "build" (sprintf "FSharp.Compiler.Service.sln -v n -c Release /p:FsLexPath=%s /p:FsYaccPath=%s" fslexPath fsyaccPath)
)

Target.create "Test" (fun _ ->
// This project file is used for the netcoreapp2.0 tests to work out reference sets
runDotnet __SOURCE_DIRECTORY__ "build" "../tests/projects/Sample_NETCoreSDK_FSharp_Library_netstandard2_0/Sample_NETCoreSDK_FSharp_Library_netstandard2_0.fsproj -nodereuse:false -v n /restore /p:DisableCompilerRedirection=true"
runDotnet __SOURCE_DIRECTORY__ "build" "../tests/projects/Sample_NETCoreSDK_FSharp_Library_netstandard2_0/Sample_NETCoreSDK_FSharp_Library_netstandard2_0.fsproj -v n /restore /p:DisableCompilerRedirection=true"

// Now run the tests
let logFilePath = Path.Combine(__SOURCE_DIRECTORY__, "..", "artifacts", "TestResults", "Release", "FSharp.Compiler.Service.Test.xml")
runDotnet __SOURCE_DIRECTORY__ "test" (sprintf "FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj --no-restore --no-build -nodereuse:false -v n -c Release --test-adapter-path . --logger \"nunit;LogFilePath=%s\"" logFilePath)
runDotnet __SOURCE_DIRECTORY__ "test" (sprintf "FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj --no-restore --no-build -v n -c Release --test-adapter-path . --logger \"nunit;LogFilePath=%s\"" logFilePath)
)

Target.create "NuGet" (fun _ ->
Expand Down
1 change: 0 additions & 1 deletion src/fsharp/FSharp.Build/FSharp.Build.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<Compile Include="FSharpEmbedResXSource.fs" />
<Compile Include="WriteCodeFragment.fs" />
<Compile Include="CreateFSharpManifestResourceName.fs" />
<Compile Include="SubstituteText.fs" />
<None Include="Microsoft.FSharp.Targets" CopyToOutputDirectory="PreserveNewest" />
<None Include="Microsoft.Portable.FSharp.Targets" CopyToOutputDirectory="PreserveNewest" />
<None Include="Microsoft.FSharp.NetSdk.targets" CopyToOutputDirectory="PreserveNewest" />
Expand Down
1 change: 0 additions & 1 deletion src/fsharp/FSharp.Build/Microsoft.FSharp.Targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ this file.
<UsingTask TaskName="CreateFSharpManifestResourceName" AssemblyFile="$(FSharpBuildAssemblyFile)" />
<UsingTask TaskName="WriteCodeFragment" AssemblyFile="$(FSharpBuildAssemblyFile)" />
<UsingTask TaskName="FSharpPlatformInformation" AssemblyFile="$(FSharpBuildAssemblyFile)" />
<UsingTask TaskName="SubstituteText" AssemblyFile="$(FSharpBuildAssemblyFile)" />

<PropertyGroup>
<ImportByWildcardBeforeMicrosoftFSharpTargets Condition="'$(ImportByWildcardBeforeMicrosoftFSharpTargets)' == ''">true</ImportByWildcardBeforeMicrosoftFSharpTargets>
Expand Down
92 changes: 0 additions & 92 deletions src/fsharp/FSharp.Build/SubstituteText.fs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion vsintegration/Vsix/RegisterFsharpPackage.pkgdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"1"="{92EF0900-2251-11D2-B72E-0000F87572EF}"

[$RootKey$\Packages\{91a04a73-4f2c-4e7c-ad38-c1a68e7da05c}]
"ProductVersion"="{{FSProductVersion}}"
"ProductVersion"="10.7"
"ProductName"="Visual F#"
"CompanyName"="Microsoft Corp."

Expand Down
16 changes: 5 additions & 11 deletions vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,16 @@
<None Include="Source.extension.vsixmanifest">
<SubType>Designer</SubType>
</None>

<NoneSubstituteText Include="..\RegisterFsharpPackage.pkgdef" CopyToOutputDirectory="PreserveNewest">
<TargetFileName>RegisterFsharpPackage.pkgdef</TargetFileName>
<Pattern1>{{FSProductVersion}}</Pattern1>
<Replacement1>$(FSProductVersion)</Replacement1>
<Pattern2>{{FSLanguageVersion}}</Pattern2>
<Replacement2>$(FSLanguageVersion)</Replacement2>
<IncludeInVSix>true</IncludeInVSix>
</NoneSubstituteText>

<Content Include="..\RegisterFsharpPackage.pkgdef">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
<Link>RegisterFsharpPackage.pkgdef</Link>
</Content>
<Content Include="$(FSharpSourcesRoot)\..\License.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>License.txt</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>

<Content Include="$(NuGetPackageRoot)\Microsoft.VisualFSharp.Type.Providers.Redist\$(MicrosoftVisualFSharpTypeProvidersRedistVersion)\content\$(FSharpDataTypeProvidersVersion)\FSharp.Data.TypeProviders.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>FSharp.Data.TypeProviders.dll</Link>
Expand Down
9 changes: 0 additions & 9 deletions vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,13 @@
<ResourceName>Menus.ctmenu</ResourceName>
<SubType>Designer</SubType>
</VSCTCompile>

<!-- Copy resx file and transform product/language version -->
<CopyVsixResources Include="Resources/**" />
<EmbeddedResource Include="VSPackage.resx">
<GenerateSource>true</GenerateSource>
<GeneratedModuleName>Microsoft.VisualStudio.FSharp.ProjectSystem.FSharpSR</GeneratedModuleName>
<MergeWithCTO>true</MergeWithCTO>
<ManifestResourceName>VSPackage</ManifestResourceName>
<SubType>Designer</SubType>
<IntermediateTargetPath>$(IntermediateOutputPath)resources\</IntermediateTargetPath>
<Pattern1>{{FSProductVersion}}</Pattern1>
<Replacement1>$(FSProductVersion)</Replacement1>
<Pattern2>{{FSLanguageVersion}}</Pattern2>
<Replacement2>$(FSLanguageVersion)</Replacement2>
</EmbeddedResource>

<Compile Include="ProjectPrelude.fs" />
<Compile Include="WaitDialog.fs" />
<Compile Include="MSBuildUtilities.fs" />
Expand Down
6 changes: 3 additions & 3 deletions vsintegration/src/FSharp.ProjectSystem.FSharp/VSPackage.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,10 +464,10 @@
<value>Customizes the environment to maximize code editor screen space and improve the visibility of F# commands and tool windows.</value>
</data>
<data name="ProductDetails" xml:space="preserve">
<value>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</value>
<value>Microsoft Visual F# Tools 10.7 for F# 4.7</value>
</data>
<data name="9002" xml:space="preserve">
<value>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</value>
<value>Microsoft Visual F# Tools 10.7 for F# 4.7</value>
</data>
<data name="ProductID" xml:space="preserve">
<value>1.0</value>
Expand All @@ -476,7 +476,7 @@
<value>Microsoft Visual F# Tools</value>
</data>
<data name="9001" xml:space="preserve">
<value>Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</value>
<value>Visual F# Tools 10.7 for F# 4.7</value>
</data>
<data name="9027" xml:space="preserve">
<value>F# Interactive</value>
Expand Down
12 changes: 6 additions & 6 deletions vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.cs.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,13 +433,13 @@
<note />
</trans-unit>
<trans-unit id="ProductDetails">
<source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
<target state="needs-review-translation">Nástroje Microsoft Visual F# {{FSProductVersion}} pro F# {{FSLanguageVersion}}</target>
<source>Microsoft Visual F# Tools 10.7 for F# 4.7</source>
<target state="translated">Nástroje Microsoft Visual F# 10.7 pro F# 4.7</target>
<note />
</trans-unit>
<trans-unit id="9002">
<source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
<target state="needs-review-translation">Nástroje Microsoft Visual F# {{FSProductVersion}} pro F# {{FSLanguageVersion}}</target>
<source>Microsoft Visual F# Tools 10.7 for F# 4.7</source>
<target state="translated">Nástroje Microsoft Visual F# 10.7 pro F# 4.7</target>
<note />
</trans-unit>
<trans-unit id="ProductID">
Expand All @@ -453,8 +453,8 @@
<note />
</trans-unit>
<trans-unit id="9001">
<source>Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
<target state="needs-review-translation">Nástroje Visual F# {{FSProductVersion}} pro F# {{FSLanguageVersion}}</target>
<source>Visual F# Tools 10.7 for F# 4.7</source>
<target state="translated">Nástroje Visual F# 10.7 pro F# 4.7</target>
<note />
</trans-unit>
<trans-unit id="9027">
Expand Down
12 changes: 6 additions & 6 deletions vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,13 +433,13 @@
<note />
</trans-unit>
<trans-unit id="ProductDetails">
<source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
<target state="needs-review-translation">Microsoft Visual F# Tools {{FSProductVersion}} für f# {{FSLanguageVersion}}</target>
<source>Microsoft Visual F# Tools 10.7 for F# 4.7</source>
<target state="translated">Microsoft Visual F# Tools 10.7 für f# 4.7</target>
<note />
</trans-unit>
<trans-unit id="9002">
<source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
<target state="needs-review-translation">Microsoft Visual F# Tools {{FSProductVersion}} für f# {{FSLanguageVersion}}</target>
<source>Microsoft Visual F# Tools 10.7 for F# 4.7</source>
<target state="translated">Microsoft Visual F# Tools 10.7 für f# 4.7</target>
<note />
</trans-unit>
<trans-unit id="ProductID">
Expand All @@ -453,8 +453,8 @@
<note />
</trans-unit>
<trans-unit id="9001">
<source>Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
<target state="needs-review-translation">Visual F# Tools {{FSProductVersion}} für F# {{FSLanguageVersion}}</target>
<source>Visual F# Tools 10.7 for F# 4.7</source>
<target state="translated">Visual F# Tools 10.7 für F# 4.7</target>
<note />
</trans-unit>
<trans-unit id="9027">
Expand Down
12 changes: 6 additions & 6 deletions vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,13 +433,13 @@
<note />
</trans-unit>
<trans-unit id="ProductDetails">
<source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
<target state="needs-review-translation">Herramientas de Microsoft Visual F# {{FSProductVersion}} para F# {{FSLanguageVersion}}</target>
<source>Microsoft Visual F# Tools 10.7 for F# 4.7</source>
<target state="translated">Herramientas de Microsoft Visual F# 10.7 para F# 4.7</target>
<note />
</trans-unit>
<trans-unit id="9002">
<source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
<target state="needs-review-translation">Herramientas de Microsoft Visual F# {{FSProductVersion}} para F# {{FSLanguageVersion}}</target>
<source>Microsoft Visual F# Tools 10.7 for F# 4.7</source>
<target state="translated">Herramientas de Microsoft Visual F# 10.7 para F# 4.7</target>
<note />
</trans-unit>
<trans-unit id="ProductID">
Expand All @@ -453,8 +453,8 @@
<note />
</trans-unit>
<trans-unit id="9001">
<source>Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
<target state="needs-review-translation">Visual F# Tools {{FSProductVersion}} para F# {{FSLanguageVersion}}</target>
<source>Visual F# Tools 10.7 for F# 4.7</source>
<target state="translated">Visual F# Tools 10.7 para F# 4.7</target>
<note />
</trans-unit>
<trans-unit id="9027">
Expand Down
12 changes: 6 additions & 6 deletions vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,13 +433,13 @@
<note />
</trans-unit>
<trans-unit id="ProductDetails">
<source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
<target state="needs-review-translation">Microsoft Visual F# Tools {{FSProductVersion}} pour F# {{FSLanguageVersion}}</target>
<source>Microsoft Visual F# Tools 10.7 for F# 4.7</source>
<target state="translated">Microsoft Visual F# Tools 10.7 pour F# 4.7</target>
<note />
</trans-unit>
<trans-unit id="9002">
<source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
<target state="needs-review-translation">Microsoft Visual F# Tools {{FSProductVersion}} pour F# {{FSLanguageVersion}}</target>
<source>Microsoft Visual F# Tools 10.7 for F# 4.7</source>
<target state="translated">Microsoft Visual F# Tools 10.7 pour F# 4.7</target>
<note />
</trans-unit>
<trans-unit id="ProductID">
Expand All @@ -453,8 +453,8 @@
<note />
</trans-unit>
<trans-unit id="9001">
<source>Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
<target state="needs-review-translation">Visual F# Tools {{FSProductVersion}} pour F# {{FSLanguageVersion}}</target>
<source>Visual F# Tools 10.7 for F# 4.7</source>
<target state="translated">Visual F# Tools 10.7 pour F# 4.7</target>
<note />
</trans-unit>
<trans-unit id="9027">
Expand Down
Loading