-
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #30 from tboby/fix-rework
WIP: Remove parser, port C# Task, and other modernisation
- Loading branch information
Showing
36 changed files
with
1,281 additions
and
1,071 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| root = true | ||
|
|
||
| [*] | ||
| end_of_line = lf | ||
| insert_final_newline = true | ||
| indent_style = space | ||
| indent_size = 4 | ||
| trim_trailing_whitespace = true | ||
|
|
||
| [*.{fs,fsx,fsi}] | ||
| max_line_length = 100 | ||
| fsharp_alternative_long_member_definitions = true | ||
| fsharp_multi_line_lambda_closing_newline = true | ||
| fsharp_multiline_bracket_style = aligned | ||
| fsharp_keep_max_number_of_blank_lines = 1 | ||
| fsharp_align_function_signature_to_indentation = true | ||
| fsharp_max_if_then_else_short_width = 0 | ||
|
|
||
| fsharp_experimental_elmish = true | ||
| fsharp_record_multiline_formatter = number_of_items | ||
| fsharp_array_or_list_multiline_formatter = number_of_items | ||
| fsharp_max_record_number_of_items = 0 | ||
| fsharp_max_array_or_list_number_of_items = 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,30 @@ | ||
| <Project> | ||
| <!-- Make F# support Central Package Management --> | ||
| <PropertyGroup> | ||
| <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference> | ||
| <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference> | ||
| </PropertyGroup> | ||
| <!-- Use lock files --> | ||
| <PropertyGroup> | ||
| <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile> | ||
| <RestoreLockedMode Condition="'$(ContinuousIntegrationBuild)' == 'true'">true</RestoreLockedMode> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <!-- Automatically set RepositoryUrl, DebugType embedded, ContinuousIntegrationBuild --> | ||
| <PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="All"/> | ||
| </ItemGroup> | ||
| <PropertyGroup> | ||
| <PackageLicenseExpression>MIT</PackageLicenseExpression> | ||
| <PackageReadmeFile>README.md</PackageReadmeFile> | ||
| <Authors>Chet Husk</Authors> | ||
| <PackageLicenseExpression>MIT</PackageLicenseExpression> | ||
| <PackageTags>version;changelog;keepachangelog</PackageTags> | ||
| <GeneratePathProperty>true</GeneratePathProperty> | ||
| <!-- Currently not automatic https://github.com/dotnet/sourcelink/issues/712 --> | ||
| <PackageProjectUrl>https://github.com/ionide/KeepAChangelog</PackageProjectUrl> | ||
| <PackageIcon>ionide.png</PackageIcon> | ||
| <PackageReadmeFile>README.md</PackageReadmeFile> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Dotnet.ReproducibleBuilds" Version="1.1.1" PrivateAssets="All" /> | ||
| <PackageReference Update="FSharp.Core" Version=""/> | ||
| </ItemGroup> | ||
| <ItemGroup Condition="'$(IsPackable)' == 'true'"> | ||
| <None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="\" /> | ||
| <None Include="$(MSBuildThisFileDirectory)ionide.png" Pack="true" PackagePath="\" /> | ||
| <None Include="$(MSBuildThisFileDirectory)/README.md" Pack="true" PackagePath="\" /> | ||
| <None Include="$(MSBuildThisFileDirectory)/ionide.png" Pack="true" PackagePath="\" /> | ||
| </ItemGroup> | ||
| </Project> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <Project> | ||
| <PropertyGroup> | ||
| <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> | ||
| <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled> | ||
| <CentralPackagePackageVersionOverride>false</CentralPackagePackageVersionOverride> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageVersion Include="EasyBuild.FileSystemProvider" Version="0.3.0" /> | ||
| <PackageVersion Include="Fixie.TestAdapter" Version="3.4.0" /> | ||
| <PackageVersion Include="FSharp.Core" Version="7.0.300" /> | ||
| <PackageVersion Include="FsToolkit.ErrorHandling" Version="4.17.0" /> | ||
| <PackageVersion Include="KeepAChangelogParser" Version="1.2.4" /> | ||
| <!-- 17.8.* aligns with .NET 8 SDK --> | ||
| <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.8.3" /> | ||
| <PackageVersion Include="Moq" Version="4.20.72" /> | ||
| <PackageVersion Include="Semver" Version="2.3.0" /> | ||
| <PackageVersion Include="Shouldly" Version="4.2.1" /> | ||
| <PackageVersion Include="SimpleExec" Version="12.0.0" /> | ||
| <PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.25" /> | ||
| <PackageVersion Include="DotNet.ReproducibleBuilds.Isolated" Version="1.2.25" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| { | ||
| "sdk": { | ||
| "version": "6.0.400" | ||
| "version": "8.0.100", | ||
| "rollForward": "latestMinor" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFrameworks>net472;net8.0</TargetFrameworks> | ||
| <IsPackable>true</IsPackable> | ||
| <Description>MSBuild Tasks and Targets that set your Assembly Version, Package Version, and Package Release Notes from your KeepAChangelog-compatible Changelogs.</Description> | ||
|
|
||
| <!-- we need the assemblies bundled, so set this so we don't expose any dependencies to the outside world --> | ||
| <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput> | ||
| <NoWarn>NU5128;NU5100</NoWarn><!-- NU5100 is because we pack to tasks/, not lib/ --> | ||
| <BuildOutputTargetFolder>tasks</BuildOutputTargetFolder> | ||
|
|
||
| <!-- deps.json generation --> | ||
| <GenerateDependencyFile>true</GenerateDependencyFile> | ||
| <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> | ||
| <!-- remove FSharp.Core localisations --> | ||
| <SatelliteResourceLanguages>en</SatelliteResourceLanguages> | ||
| <!-- Setting this sets the `developmentDependency` flag on our generated package, | ||
| which means that consumers don't need to set PrivateAssets="all" and IncludeAssets="build, buildMultitargeting" | ||
| to make use of this project without impacting their own dependency trees. --> | ||
| <DevelopmentDependency>true</DevelopmentDependency> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Compile Include="Log.fs" /> | ||
| <Compile Include="Library.fs" /> | ||
| <!-- these lines pack the single-TFM build props/targets files to the `build` folder in the generated package. | ||
| By convention, the .NET SDK will look for `build\<Package Id>.props` and `build\<Package Id>.targets` | ||
| for automatic inclusion in a single-TFM build. --> | ||
| <Content Include="build\*" PackagePath="build\" /> | ||
| <!-- these lines pack the multi-target TFM build props/targets files to the `buildMultiTargeting` folder in the generated package. | ||
| By convention, the .NET SDK will look for `buildMultiTargeting\<Package Id>.props` and `buildMultiTargeting\<Package Id>.targets` | ||
| for automatic inclusion in a multi-TFM build. --> | ||
| <Content Include="buildMultiTargeting\*" PackagePath="buildMultiTargeting\" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <!-- All dependencies need PrivateAssets="all" not flow as a nuget-dependency to consumers --> | ||
| <!-- MS.B.U.C specifically--> | ||
| <PackageReference Include="FsToolkit.ErrorHandling" PrivateAssets="all" /> | ||
| <PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="Runtime" PrivateAssets="all" /> | ||
| <PackageReference Include="KeepAChangelogParser" PrivateAssets="all" /> | ||
| <PackageReference Include="Semver" PrivateAssets="all" /> | ||
| <PackageReference Include="FSharp.Core" PrivateAssets="all" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- This target adds the deps.json file to the TFM-specific subfolder of runtime dependencies of the app. --> | ||
| <Target Name="AddBuildDependencyFileToBuiltProjectOutputGroupOutput" BeforeTargets="BuiltProjectOutputGroup" Condition=" '$(GenerateDependencyFile)' == 'true'"> | ||
|
|
||
| <ItemGroup> | ||
| <BuiltProjectOutputGroupOutput Include="$(ProjectDepsFilePath)" TargetPath="$(ProjectDepsFileName)" FinalOutputPath="$(ProjectDepsFilePath)" /> | ||
| </ItemGroup> | ||
| </Target> | ||
|
|
||
| <!-- This target copies the runtime dependencies of this project (all PackageReferences without ExcludeAssets="runtime") to the package | ||
| without having to manually specify the correct sub-paths. --> | ||
| <Target Name="CopyProjectReferencesToPackage" DependsOnTargets="ResolveReferences"> | ||
| <ItemGroup> | ||
| <!-- the dependencies of your MSBuild task must be packaged inside the package, they cannot be expressed as normal PackageReferences --> | ||
| <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths)" TargetPath="%(ReferenceCopyLocalPaths.DestinationSubPath)" /> | ||
| </ItemGroup> | ||
| </Target> | ||
|
|
||
| </Project> |
78 changes: 0 additions & 78 deletions
78
src/Ionide.KeepAChangelog.Tasks/Ionide.KeepAChangelog.Tasks.fsproj
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.