Skip to content
This repository was archived by the owner on Apr 13, 2026. It is now read-only.

Commit 6bae8f1

Browse files
Merge pull request #9 from FrendsPlatform/fspw-200
Clean up and update project templates
2 parents e07e907 + 0e7e628 commit 6bae8f1

30 files changed

Lines changed: 830 additions & 539 deletions

.gitattributes

Lines changed: 85 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,89 @@
1-
###############################################################################
2-
# Set default behavior to automatically normalize line endings.
3-
###############################################################################
4-
* text=auto
1+
# Common settings that generally should always be used with your language specific settings
52

6-
###############################################################################
7-
# Set default behavior for command prompt diff.
3+
# Auto detect text files and perform LF normalization
4+
# https://www.davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/
5+
* text=auto eol=lf
6+
7+
#
8+
# The above will handle all files NOT found below
89
#
9-
# This is need for earlier builds of msysgit that does not have it on by
10-
# default for csharp files.
11-
# Note: This is only used by command line
12-
###############################################################################
13-
#*.cs diff=csharp
14-
15-
###############################################################################
16-
# Set the merge driver for project and solution files
10+
11+
# Code files
12+
*.cs text diff=csharp
13+
*.cshtml text diff=html
14+
*.csx text diff=csharp
15+
16+
# Project files
17+
*.sln text eol=crlf
18+
*.csproj text eol=crlf
19+
20+
# Documents
21+
*.bibtex text diff=bibtex
22+
*.doc diff=astextplain
23+
*.DOC diff=astextplain
24+
*.docx diff=astextplain
25+
*.DOCX diff=astextplain
26+
*.dot diff=astextplain
27+
*.DOT diff=astextplain
28+
*.pdf diff=astextplain
29+
*.PDF diff=astextplain
30+
*.rtf diff=astextplain
31+
*.RTF diff=astextplain
32+
*.md text
33+
*.tex text diff=tex
34+
*.adoc text
35+
*.textile text
36+
*.mustache text
37+
*.csv text
38+
*.tab text
39+
*.tsv text
40+
*.txt text
41+
*.sql text
42+
43+
# Graphics
44+
*.png binary
45+
*.jpg binary
46+
*.jpeg binary
47+
*.gif binary
48+
*.tif binary
49+
*.tiff binary
50+
*.ico binary
51+
# SVG treated as an asset (binary) by default.
52+
*.svg text
53+
# If you want to treat it as binary,
54+
# use the following line instead.
55+
# *.svg binary
56+
*.eps binary
57+
58+
# Scripts
59+
*.bash text eol=lf
60+
*.fish text eol=lf
61+
*.sh text eol=lf
62+
# These are explicitly windows files and should use crlf
63+
*.bat text eol=crlf
64+
*.cmd text eol=crlf
65+
*.ps1 text eol=crlf
66+
67+
# Serialisation
68+
*.json text
69+
*.toml text
70+
*.xml text
71+
*.yaml text
72+
*.yml text
73+
74+
# Archives
75+
*.7z binary
76+
*.gz binary
77+
*.tar binary
78+
*.tgz binary
79+
*.zip binary
80+
81+
# Text files where line endings should be preserved
82+
*.patch -text
83+
1784
#
18-
# Merging from the command prompt will add diff markers to the files if there
19-
# are conflicts (Merging from VS is not affected by the settings below, in VS
20-
# the diff markers are never inserted). Diff markers may cause the following
21-
# file extensions to fail to load in VS. An alternative would be to treat
22-
# these files as binary and thus will always conflict and require user
23-
# intervention with every merge. To do so, just uncomment the entries below
24-
###############################################################################
25-
#*.sln merge=binary
26-
#*.csproj merge=binary
27-
#*.vbproj merge=binary
28-
#*.vcxproj merge=binary
29-
#*.vcproj merge=binary
30-
#*.dbproj merge=binary
31-
#*.fsproj merge=binary
32-
#*.lsproj merge=binary
33-
#*.wixproj merge=binary
34-
#*.modelproj merge=binary
35-
#*.sqlproj merge=binary
36-
#*.wwaproj merge=binary
37-
38-
###############################################################################
39-
# behavior for image files
85+
# Exclude files from exporting
4086
#
41-
# image files are treated as binary by default.
42-
###############################################################################
43-
#*.jpg binary
44-
#*.png binary
45-
#*.gif binary
46-
47-
###############################################################################
48-
# diff behavior for common document formats
49-
#
50-
# Convert binary document formats to text before diffing them. This feature
51-
# is only available from the command line. Turn it on by uncommenting the
52-
# entries below.
53-
###############################################################################
54-
#*.doc diff=astextplain
55-
#*.DOC diff=astextplain
56-
#*.docx diff=astextplain
57-
#*.DOCX diff=astextplain
58-
#*.dot diff=astextplain
59-
#*.DOT diff=astextplain
60-
#*.pdf diff=astextplain
61-
#*.PDF diff=astextplain
62-
#*.rtf diff=astextplain
63-
#*.RTF diff=astextplain
87+
88+
.gitattributes export-ignore
89+
.gitignore export-ignore

.github/workflows/AutoBuild.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches-ignore:
66
- main
7-
7+
88
env:
99
azure_artifacts_feed_url: https://pkgs.dev.azure.com/frends-platform/frends-tasks/_packaging/test/nuget/v3/index.json
1010

@@ -13,18 +13,17 @@ jobs:
1313
name: AutoBuild on ubuntu-latest
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v1
16+
- uses: actions/checkout@v4.2.2
17+
18+
- name: Pack release version
19+
run: dotnet pack --configuration Release
20+
21+
- uses: actions/setup-dotnet@v4.3.1
22+
with:
23+
dotnet-version: '6.0.x'
24+
source-url: ${{ env.azure_artifacts_feed_url }}
25+
env:
26+
NUGET_AUTH_TOKEN: ${{ secrets.TASKS_TEST_FEED_API_KEY }}
1727

18-
- name: Pack release version
19-
run: dotnet pack --configuration Release
20-
21-
# Setup dotnet again with test feed
22-
- uses: actions/setup-dotnet@v1
23-
with:
24-
dotnet-version: '6.0.x'
25-
source-url: ${{ env.azure_artifacts_feed_url }}
26-
env:
27-
NUGET_AUTH_TOKEN: ${{ secrets.TASKS_TEST_FEED_API_KEY }}
28-
# Push the package to the test feed
29-
- name: Push NuGet package(s) to the test feed
30-
run: dotnet nuget push bin/Release/frendstasktemplate.*.nupkg --api-key ${{ secrets.TASKS_TEST_FEED_API_KEY }} --source ${{ env.azure_artifacts_feed_url }} --skip-duplicate
28+
- name: Push NuGet package(s) to the test feed
29+
run: dotnet nuget push bin/Release/frendstasktemplate.*.nupkg --api-key ${{ secrets.TASKS_TEST_FEED_API_KEY }} --source ${{ env.azure_artifacts_feed_url }} --skip-duplicate

.github/workflows/BuildMaster.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: BuildMaster.yml
1+
name: BuildMaster
22

33
on:
44
push:
@@ -13,18 +13,18 @@ jobs:
1313
name: Build master on ubuntu-latest
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v1
16+
- uses: actions/checkout@v4.2.2
1717

18-
- name: Pack release version
19-
run: dotnet pack --configuration Release
20-
21-
# Setup dotnet again with prod feed
22-
- uses: actions/setup-dotnet@v1
23-
with:
24-
dotnet-version: '6.0.x'
25-
source-url: ${{ env.azure_artifacts_feed_url }}
26-
env:
27-
NUGET_AUTH_TOKEN: ${{ secrets.TASKS_FEED_API_KEY }}
28-
- name: Push NuGet package(s) to the prod feed
29-
run: dotnet nuget push bin/Release/frendstasktemplate.*.nupkg --api-key ${{ secrets.TASKS_FEED_API_KEY }} --source ${{ env.azure_artifacts_feed_url }}
18+
- name: Pack release version
19+
run: dotnet pack --configuration Release
20+
21+
- uses: actions/setup-dotnet@v4.3.1
22+
with:
23+
dotnet-version: '6.0.x'
24+
source-url: ${{ env.azure_artifacts_feed_url }}
25+
env:
26+
NUGET_AUTH_TOKEN: ${{ secrets.TASKS_FEED_API_KEY }}
27+
28+
- name: Push NuGet package(s) to the prod feed
29+
run: dotnet nuget push bin/Release/frendstasktemplate.*.nupkg --api-key ${{ secrets.TASKS_FEED_API_KEY }} --source ${{ env.azure_artifacts_feed_url }}
3030

.github/workflows/Execute_build_and_test_on_main.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

.github/workflows/Execute_build_and_test_on_push.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

.github/workflows/Execute_release.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)