Parameterize product version #8031

KevinRansom · 2019-12-20T12:14:04Z

The product Language and version for each branch are specified in eng/versions.props.

With this change we will use those versions to set the vsix properties used to display labels in visual studio.

This fixes: #8018

This was insanely more tricky than I thought. Basically it blew up my Christmas, which makes me very sad indeed.

The really tough part was coming up with something that didn't wreck the good work done by the xlf translations stuff.

In the end I decided to:

Add a build task that copies and substitutes the values.
Overrode the BeforeResGen build target which runs immediately before ResGen is run.
3.. Transform the files that have been copied to the obj\flavour\tfm directory into the resources directory.
As well as that I copy the resources from src\Resources to obj\flavour\tfm\resources\Resources, otherwise resgen will not find them (it relies on relative paths).
Modify the paths of the files passed to resgen to point to the transformed files.

abelbraaksma · 2019-12-20T12:28:53Z

I assume this doesn't solve the appearance of 'beta' in the version string for RTM releases, as that's a Microsoft-wide policy (I've come to understand that c# exhibits the same problem, see #7726)?

Just curious ;)

cartermp · 2019-12-20T15:46:37Z

@abelbraaksma Nope.

abelbraaksma · 2019-12-20T16:37:56Z

@abelbraaksma Nope.

Haha, very concise! I noticed in the other thread. Sorry for the noise ;).

brettfo · 2019-12-20T19:18:15Z

vsintegration/src/FSharp.ProjectSystem.FSharp/VSPackage.resx

@@ -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 10.4 for F# 4.6</value>


I don't like the hackery in the project file. I'd rather ProjectSystem.fsproj get reverted and these strings updated to: Microsoft Visual F# Tools {0} for F# {1}, then call string.Format() with the values FSharp.BuildProperties.fsProductVersion/fsLanguageVersion as generated here.

@brettfo,

I feel you … unfortunately these values are read by vs from the resource strings. We just tell VS the resource IDs it then grabs the resources and displays them. Here.

We can put the build targets in FSharpBuild.Directory.Build.targets in order to remove the hackery from the project. The bit I'm still trying to figure out, is how to not break xlf, and yet update the localized versions of vspackage ... all in all it is quite touchy.

brettfo · 2019-12-20T19:19:45Z

vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj

-      <Link>RegisterFsharpPackage.pkgdef</Link>
-    </Content>
+
+    <NoneSubstituteText Include="..\RegisterFsharpPackage.pkgdef" CopyToOutputDirectory="PreserveNewest">


This probably won't work unless we specially handle @(ContentSubstituteText), otherwise the VSSDK probably won't find the .pkgdef in the @(None) collection.

@brettfo I believe the VSSDK picks the packagedefs out of the output directory and since the NoneSubstituteText puts the transformed file there, all is good..

@brettfo, Okay fixed it.

# This is the 1st commit message: ref -> mutable in more places in the compiler # The commit message dotnet#2 will be skipped: # Update dependencies from https://github.com/dotnet/arcade build 20191229.1 # # - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19629.1 # The commit message dotnet#3 will be skipped: # Update dependencies from https://github.com/dotnet/arcade build 20191230.1 # # - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19630.1 # The commit message dotnet#4 will be skipped: # Update dependencies from https://github.com/dotnet/arcade build 20191231.1 # # - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19631.1 # The commit message dotnet#5 will be skipped: # Update dependencies from https://github.com/dotnet/arcade build 20200101.1 # # - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20051.1 # The commit message dotnet#6 will be skipped: # Update dependencies from https://github.com/dotnet/arcade build 20191216.5 (dotnet#8079) # # - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19616.5 # The commit message dotnet#7 will be skipped: # dispose fsi at the end of a scripting session (dotnet#8084) # # The commit message dotnet#8 will be skipped: # Added static link tests and extended CompilerAssert (dotnet#8101) # # * Changed CompilerAssert to static class. Added Compile/Execute methods that take a Compilation description. Added static link tests # # * Hiding compilation description internals # # * Added another test to check for sanity # # * Making a few optional parameters # # * Hiding internals of CompilationReference # The commit message dotnet#9 will be skipped: # Parameterize product version (dotnet#8031) # # * Parameterize Product details # # * fcs # # * Repack pkgdef

…8063) * # This is a combination of 9 commits. # This is the 1st commit message: ref -> mutable in more places in the compiler # The commit message #2 will be skipped: # Update dependencies from https://github.com/dotnet/arcade build 20191229.1 # # - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19629.1 # The commit message #3 will be skipped: # Update dependencies from https://github.com/dotnet/arcade build 20191230.1 # # - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19630.1 # The commit message #4 will be skipped: # Update dependencies from https://github.com/dotnet/arcade build 20191231.1 # # - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19631.1 # The commit message #5 will be skipped: # Update dependencies from https://github.com/dotnet/arcade build 20200101.1 # # - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20051.1 # The commit message #6 will be skipped: # Update dependencies from https://github.com/dotnet/arcade build 20191216.5 (#8079) # # - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19616.5 # The commit message #7 will be skipped: # dispose fsi at the end of a scripting session (#8084) # # The commit message #8 will be skipped: # Added static link tests and extended CompilerAssert (#8101) # # * Changed CompilerAssert to static class. Added Compile/Execute methods that take a Compilation description. Added static link tests # # * Hiding compilation description internals # # * Added another test to check for sanity # # * Making a few optional parameters # # * Hiding internals of CompilationReference # The commit message #9 will be skipped: # Parameterize product version (#8031) # # * Parameterize Product details # # * fcs # # * Repack pkgdef * no ilread

This reverts commit 75ae876.

* Parameterize Product details * fcs * Repack pkgdef

…otnet#8063) * # This is a combination of 9 commits. # This is the 1st commit message: ref -> mutable in more places in the compiler # The commit message #2 will be skipped: # Update dependencies from https://github.com/dotnet/arcade build 20191229.1 # # - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19629.1 # The commit message #3 will be skipped: # Update dependencies from https://github.com/dotnet/arcade build 20191230.1 # # - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19630.1 # The commit message #4 will be skipped: # Update dependencies from https://github.com/dotnet/arcade build 20191231.1 # # - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19631.1 # The commit message #5 will be skipped: # Update dependencies from https://github.com/dotnet/arcade build 20200101.1 # # - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20051.1 # The commit message #6 will be skipped: # Update dependencies from https://github.com/dotnet/arcade build 20191216.5 (dotnet#8079) # # - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19616.5 # The commit message #7 will be skipped: # dispose fsi at the end of a scripting session (dotnet#8084) # # The commit message #8 will be skipped: # Added static link tests and extended CompilerAssert (dotnet#8101) # # * Changed CompilerAssert to static class. Added Compile/Execute methods that take a Compilation description. Added static link tests # # * Hiding compilation description internals # # * Added another test to check for sanity # # * Making a few optional parameters # # * Hiding internals of CompilationReference # The commit message #9 will be skipped: # Parameterize product version (dotnet#8031) # # * Parameterize Product details # # * fcs # # * Repack pkgdef * no ilread

KevinRansom requested review from brettfo and cartermp December 20, 2019 12:14

cartermp approved these changes Dec 20, 2019

View reviewed changes

brettfo requested changes Dec 20, 2019

View reviewed changes

KevinRansom force-pushed the parameterizeproductversion branch 2 times, most recently from f0e37d4 to c8507f3 Compare January 4, 2020 21:46

Parameterize Product details

1d7f614

KevinRansom force-pushed the parameterizeproductversion branch from c8507f3 to 1d7f614 Compare January 4, 2020 21:46

KevinRansom added 2 commits January 4, 2020 16:51

fcs

d69d9f2

Repack pkgdef

510bea6

brettfo approved these changes Jan 6, 2020

View reviewed changes

cartermp merged commit 75ae876 into dotnet:master Jan 6, 2020

brettfo added a commit to brettfo/fsharp that referenced this pull request Jan 8, 2020

Revert "Parameterize product version (dotnet#8031)"

719673a

This reverts commit 75ae876.

brettfo mentioned this pull request Jan 8, 2020

Revert parameterized product version and update version numbers #8125

Closed

KevinRansom deleted the parameterizeproductversion branch January 15, 2020 23:02

nosami pushed a commit to xamarin/visualfsharp that referenced this pull request Feb 23, 2021

Parameterize product version (dotnet#8031)

f54aa60

* Parameterize Product details * fcs * Repack pkgdef

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Parameterize product version #8031

Parameterize product version #8031

KevinRansom commented Dec 20, 2019 •

edited

Loading

abelbraaksma commented Dec 20, 2019 •

edited

Loading

cartermp commented Dec 20, 2019

abelbraaksma commented Dec 20, 2019

brettfo Dec 20, 2019

KevinRansom Dec 21, 2019

brettfo Dec 20, 2019

KevinRansom Dec 28, 2019

KevinRansom Jan 5, 2020

Parameterize product version #8031

Parameterize product version #8031

Conversation

KevinRansom commented Dec 20, 2019 • edited Loading

abelbraaksma commented Dec 20, 2019 • edited Loading

cartermp commented Dec 20, 2019

abelbraaksma commented Dec 20, 2019

brettfo Dec 20, 2019

Choose a reason for hiding this comment

KevinRansom Dec 21, 2019

Choose a reason for hiding this comment

brettfo Dec 20, 2019

Choose a reason for hiding this comment

KevinRansom Dec 28, 2019

Choose a reason for hiding this comment

KevinRansom Jan 5, 2020

Choose a reason for hiding this comment

KevinRansom commented Dec 20, 2019 •

edited

Loading

abelbraaksma commented Dec 20, 2019 •

edited

Loading