Skip to content

Commit f8082bc

Browse files
TheAngryByrdTheAngryByrd
authored
Merge pull request #5 from fradav/master
working version for dotnet 9.*
2 parents b4c3484 + 6de561f commit f8082bc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1559
-849
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
"isRoot": true,
44
"tools": {
55
"paket": {
6-
"version": "5.242.2",
6+
"version": "9.0.2",
77
"commands": [
88
"paket"
9-
]
9+
],
10+
"rollForward": false
1011
}
1112
}
1213
}

‎.editorconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[*.{fs,fsx,fsi}]
2+
fsharp_multiline_bracket_style = stroustrup

‎.github/workflows/build.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Build master
2+
3+
on:
4+
push:
5+
pull_request:
6+
branches: [ master ]
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v4
13+
- name: Setup .NET
14+
uses: actions/setup-dotnet@v3
15+
with:
16+
dotnet-version: |
17+
9.0.x
18+
8.0.x
19+
- name: Restore dependencies
20+
run: dotnet tool restore; dotnet restore
21+
- name: Build and test
22+
run: |
23+
dotnet build --no-restore
24+
dotnet test --no-build --verbosity normal
25+
- name : Pack and Publish if tag present
26+
if: startsWith(github.ref, 'refs/tags/v')
27+
run: |
28+
dotnet pack -c Release -o nuget-packages --no-build
29+
dotnet nuget push nuget-packages/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@ bin
33
.ionide
44
paket-files
55
.DS_Store
6-
.idea/
6+
.idea/
7+
.fake
8+
.depman-fsproj/
9+
.nupkg/

‎.paket/Paket.Restore.targets‎

Lines changed: 510 additions & 439 deletions
Large diffs are not rendered by default.

‎.vscode/settings.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"yaml.schemas": {
3+
"https://json.schemastore.org/github-workflow.json": ".github/workflows/build.yml"
4+
},
5+
"files.exclude": {
6+
"**/.git": true,
7+
"**/.svn": true,
8+
"**/.hg": true,
9+
"**/CVS": true,
10+
"**/.DS_Store": true,
11+
"**/Thumbs.db": true,
12+
"**/bin": true,
13+
"**/obj": true,
14+
".paket": true,
15+
"paket-files": true
16+
}
17+
}

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Changelog
2+
3+
## [1.0.0] - 2022-01-24
4+
5+
- Use Ionide.ProjInfo to load all project files recursively and generate load script and collect source files

‎DependencyManager.FsProj.sln‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0C3E2DE1-181
77
EndProject
88
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "DependencyManager.FsProj", "src\DependencyManager.FsProj\DependencyManager.FsProj.fsproj", "{16D1C80D-80C5-4C84-B9B5-30A791F31322}"
99
EndProject
10-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "test", "test\test.fsproj", "{554ECE47-35CF-4AF7-BC7B-5BAB86AAD2F1}"
10+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "test", "test\test.fsproj", "{5558DAB8-BB9B-4465-9C5C-2E3FCC1A4CF3}"
1111
EndProject
1212
Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -34,18 +34,18 @@ Global
3434
{16D1C80D-80C5-4C84-B9B5-30A791F31322}.Release|x64.Build.0 = Release|Any CPU
3535
{16D1C80D-80C5-4C84-B9B5-30A791F31322}.Release|x86.ActiveCfg = Release|Any CPU
3636
{16D1C80D-80C5-4C84-B9B5-30A791F31322}.Release|x86.Build.0 = Release|Any CPU
37-
{554ECE47-35CF-4AF7-BC7B-5BAB86AAD2F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38-
{554ECE47-35CF-4AF7-BC7B-5BAB86AAD2F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
39-
{554ECE47-35CF-4AF7-BC7B-5BAB86AAD2F1}.Debug|x64.ActiveCfg = Debug|Any CPU
40-
{554ECE47-35CF-4AF7-BC7B-5BAB86AAD2F1}.Debug|x64.Build.0 = Debug|Any CPU
41-
{554ECE47-35CF-4AF7-BC7B-5BAB86AAD2F1}.Debug|x86.ActiveCfg = Debug|Any CPU
42-
{554ECE47-35CF-4AF7-BC7B-5BAB86AAD2F1}.Debug|x86.Build.0 = Debug|Any CPU
43-
{554ECE47-35CF-4AF7-BC7B-5BAB86AAD2F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
44-
{554ECE47-35CF-4AF7-BC7B-5BAB86AAD2F1}.Release|Any CPU.Build.0 = Release|Any CPU
45-
{554ECE47-35CF-4AF7-BC7B-5BAB86AAD2F1}.Release|x64.ActiveCfg = Release|Any CPU
46-
{554ECE47-35CF-4AF7-BC7B-5BAB86AAD2F1}.Release|x64.Build.0 = Release|Any CPU
47-
{554ECE47-35CF-4AF7-BC7B-5BAB86AAD2F1}.Release|x86.ActiveCfg = Release|Any CPU
48-
{554ECE47-35CF-4AF7-BC7B-5BAB86AAD2F1}.Release|x86.Build.0 = Release|Any CPU
37+
{5558DAB8-BB9B-4465-9C5C-2E3FCC1A4CF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38+
{5558DAB8-BB9B-4465-9C5C-2E3FCC1A4CF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
39+
{5558DAB8-BB9B-4465-9C5C-2E3FCC1A4CF3}.Debug|x64.ActiveCfg = Debug|Any CPU
40+
{5558DAB8-BB9B-4465-9C5C-2E3FCC1A4CF3}.Debug|x64.Build.0 = Debug|Any CPU
41+
{5558DAB8-BB9B-4465-9C5C-2E3FCC1A4CF3}.Debug|x86.ActiveCfg = Debug|Any CPU
42+
{5558DAB8-BB9B-4465-9C5C-2E3FCC1A4CF3}.Debug|x86.Build.0 = Debug|Any CPU
43+
{5558DAB8-BB9B-4465-9C5C-2E3FCC1A4CF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
{5558DAB8-BB9B-4465-9C5C-2E3FCC1A4CF3}.Release|Any CPU.Build.0 = Release|Any CPU
45+
{5558DAB8-BB9B-4465-9C5C-2E3FCC1A4CF3}.Release|x64.ActiveCfg = Release|Any CPU
46+
{5558DAB8-BB9B-4465-9C5C-2E3FCC1A4CF3}.Release|x64.Build.0 = Release|Any CPU
47+
{5558DAB8-BB9B-4465-9C5C-2E3FCC1A4CF3}.Release|x86.ActiveCfg = Release|Any CPU
48+
{5558DAB8-BB9B-4465-9C5C-2E3FCC1A4CF3}.Release|x86.Build.0 = Release|Any CPU
4949
EndGlobalSection
5050
GlobalSection(NestedProjects) = preSolution
5151
{16D1C80D-80C5-4C84-B9B5-30A791F31322} = {0C3E2DE1-181B-425D-B264-FA57AA656DE7}

‎Directory.Build.props‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Project>
2+
<PropertyGroup>
3+
<Version>0.2.11</Version>
4+
<Authors>Florian Verdonck, Krzysztof Cieslak, Tomas Leko, François-David Collin</Authors>
5+
<Description>
6+
This nuget package enables loading .fsproj files in .fsx scripts.
7+
To use it install nuget package and add command line option "--compilertool:directory_containing_dependencymanager"
8+
or if you are using ionide add the line to "FSharp.FSIExtraInteractiveParameters" and "FSharp.FSIExtraSharedParameters".
9+
</Description>
10+
<PackageReadmeFile>README.md</PackageReadmeFile>
11+
<PackageLicenseUrl>LICENSE.md</PackageLicenseUrl>
12+
<PackageProjectUrl>https://github.com/ThisFunctionalTom/DependencyManager.FsProj</PackageProjectUrl>
13+
<PackageRepositoryUrl>https://github.com/ThisFunctionalTom/DependencyManager.FsProj</PackageRepositoryUrl>
14+
</PropertyGroup>
15+
</Project>

‎LICENSE.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
The MIT License (MIT)
1+
# The MIT License (MIT)
22

3-
Copyright (c) 2020 Krzysztof Cieslak
3+
Copyright (c) 2020 Krzysztof Cieslak, Tomas Leko
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21-
THE SOFTWARE.
21+
THE SOFTWARE.

0 commit comments

Comments
 (0)