Skip to content

Commit

Permalink
Merge pull request #2732 from FoothillSolutions/master
Browse files Browse the repository at this point in the history
6.0.0 Release
  • Loading branch information
yazeedobaid authored Feb 20, 2023
2 parents 8dbf221 + d4fbede commit 40dfff0
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 12 deletions.
3 changes: 3 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Release Notes

## 6.0.0 - 2023-02-20
* ENHANCEMENT: Site UI fixes and documentation link fixes.

## 6.0.0-beta001 - 2022-12-21
* BUGFIX: Error detecting msbuild version on Linux, thanks @yazeedobaid - https://github.com/fsprojects/FAKE/issues/2709
* ENHANCEMENT: Add ignoreConflicts parameter to paket push, thanks @gdziadkiewicz - https://github.com/fsprojects/FAKE/pull/2720
Expand Down
8 changes: 4 additions & 4 deletions docs/articles/dotnet-assemblyinfo.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ let version =
| _ -> "0.2"
```

![alt text](//content/img/assemblyinfo/result.png "The file version is set by FAKE")
![The file version is set by FAKE](/content/img/assemblyinfo/result.png)

## Storing the `githash` in the `AssemblyInfo` File

Expand All @@ -70,18 +70,18 @@ AssemblyInfo.Metadata("githash", commitHash)

One of the easiest ways to retrieve this hash is to load and use a reflector program, like [<ins>ILSpy</ins>](https://github.com/icsharpcode/ILSpy):

![alt text](//content/img/assemblyinfo/assemblymetadata.png "Checking the git hash of an assembly")
![Checking the git hash of an assembly](/content/img/assemblyinfo/assemblymetadata.png)

## Using the `SolutionInfo` Approach

Some companies split their `AssemblyInfo` into a `SolutionInfo.cs` which is shared by all projects and a specific `AssemblyInfo.cs` per
project which contains the product data. All versioning data is generated by the `AssemblyInfo` task into the `SolutionInfo.cs` and the
`AssemblyInfo.cs` files are edited manually. This could look like this:

![alt text](//content/img/assemblyinfo/solutioninfo.png "SolutionInfo.cs is shared between projects")
![SolutionInfo.cs is shared between projects](/content/img/assemblyinfo/solutioninfo.png)

> The above picture and code within is from FAKE v4 (but the concept is very similar with fake 5 and above)
The generated `SolutionInfo.cs` looks like this:

![alt text](//content/img/assemblyinfo/generated.png "Generated SolutionInfo.cs")
![Generated SolutionInfo.cs](/content/img/assemblyinfo/generated.png)
2 changes: 1 addition & 1 deletion docs/content/assets/css/tailwind.css

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,16 @@
</header>

<section
class="flex flex-col lg:flex-row justify-center items-center min-h-screen space-x-0 lg:space-x-10 bg-gray-800">
class="flex flex-col lg:flex-row justify-center items-center min-h-screen space-x-0 lg:space-x-10 bg-gray-800 pb-20 md:pb-0">

<div class="mt-10 lg:mt-0 flex flex-col justify-center items-center space-y-10">
<h1
class="text-center text-2xl md:text-4xl font-bold text-[#d4b43c] leading-6 md:leading-10 tracking-wide lg:tracking-widest">
class="text-center px-4 text-2xl md:text-4xl font-bold text-[#d4b43c] leading-6 md:leading-10 tracking-wide lg:tracking-widest">
A DSL FOR BUILD TASKS AND MORE
<br />
THE POWER OF F# - ANYWHERE - ANYTIME
</h1>
<div class="flex justify-between items-center space-x-5">
<div class="flex flex-col md:flex-row justify-center md:justify-between items-center space-x-0 space-y-5 md:space-y-0 md:space-x-5">
<a href="/guide.html"
class="w-48 py-3 flex justify-center bg-[#d4b43c] text-white rounded shadow-md font-semibold bg-gradient-to-r from-red-800 via-yellow-600 to-[#d4b43c] hover:from-[#d4b43c]">
Guide
Expand All @@ -100,7 +100,7 @@
</div>
</div>

<div class="mt-10 lg:mt-0 z-10 shadow-lg bg-[#d4b43c] p-20 rounded-lg">
<div class="mt-10 lg:mt-0 z-10 shadow-lg bg-[#d4b43c] p-4 md:p-20 md:rounded-lg">
<img alt="main sample code to illustrate FAKE syntax" src="/content/img/homepage/code-sample.svg">
</div>

Expand Down Expand Up @@ -204,7 +204,7 @@ <h3 class="text-4xl font-medium text-gray-900 tracking-widest">
libraries by including them directly or via Paket.
</p>
</div>
<div class="p-20 bg-[#d4b43c] rounded-lg shadow-xl shadow-gray-300">
<div class="bg-[#d4b43c] shadow-xl shadow-gray-300 p-4 md:p-20 md:rounded-lg">
<img alt="code sample #1" src="/content/img/homepage/code-sample-1.svg">
</div>
</section>
Expand All @@ -215,7 +215,7 @@ <h3 class="text-4xl font-medium text-gray-900 tracking-widest">
</div>

<section class="mt-40 flex justify-between items-center flex-col lg:flex-row space-y-10 lg:space-y-0 mx-10">
<div class="order-2 lg:order-1 mt-10 lg:mt-0 p-20 bg-[#d4b43c] rounded-lg shadow-xl shadow-gray-300 z-0">
<div class="order-2 lg:order-1 mt-10 lg:mt-0 bg-[#d4b43c] shadow-xl shadow-gray-300 z-0 p-4 md:p-20 md:rounded-lg">
<img alt="code sample #2" src="/content/img/homepage/code-sample-2.svg">
</div>
<div class="order-1 lg:order-2">
Expand Down Expand Up @@ -247,7 +247,7 @@ <h3 class="text-4xl font-medium text-gray-900 tracking-widest">
<img alt="background illustration - hexagons to demonstrate FAKE's modularity"
src="/content/img/homepage/shape-2.svg">
</div>
<div class="p-20 bg-[#d4b43c] rounded-lg shadow-xl shadow-gray-300">
<div class="bg-[#d4b43c] shadow-xl shadow-gray-300 p-4 md:p-20 md:rounded-lg">
<img alt="code sample #3" src="/content/img/homepage/code-sample-3.svg">
</div>
</section>
Expand Down

0 comments on commit 40dfff0

Please sign in to comment.