Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 85 additions & 59 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,63 +1,89 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto
# Common settings that generally should always be used with your language specific settings

###############################################################################
# Set default behavior for command prompt diff.
# Auto detect text files and perform LF normalization
# https://www.davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/
* text=auto eol=lf

#
# The above will handle all files NOT found below
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp

###############################################################################
# Set the merge driver for project and solution files

# Code files
*.cs text diff=csharp
*.cshtml text diff=html
*.csx text diff=csharp

# Project files
*.sln text eol=crlf
*.csproj text eol=crlf

# Documents
*.bibtex text diff=bibtex
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
*.md text
*.tex text diff=tex
*.adoc text
*.textile text
*.mustache text
*.csv text
*.tab text
*.tsv text
*.txt text
*.sql text

# Graphics
*.png binary
*.jpg binary
*.jpeg binary
*.gif binary
*.tif binary
*.tiff binary
*.ico binary
# SVG treated as an asset (binary) by default.
*.svg text
# If you want to treat it as binary,
# use the following line instead.
# *.svg binary
*.eps binary

# Scripts
*.bash text eol=lf
*.fish text eol=lf
*.sh text eol=lf
# These are explicitly windows files and should use crlf
*.bat text eol=crlf
*.cmd text eol=crlf
*.ps1 text eol=crlf

# Serialisation
*.json text
*.toml text
*.xml text
*.yaml text
*.yml text

# Archives
*.7z binary
*.gz binary
*.tar binary
*.tgz binary
*.zip binary

# Text files where line endings should be preserved
*.patch -text

#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary

###############################################################################
# behavior for image files
# Exclude files from exporting
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary

###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain

.gitattributes export-ignore
.gitignore export-ignore
29 changes: 14 additions & 15 deletions .github/workflows/AutoBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches-ignore:
- main

env:
azure_artifacts_feed_url: https://pkgs.dev.azure.com/frends-platform/frends-tasks/_packaging/test/nuget/v3/index.json

Expand All @@ -13,18 +13,17 @@ jobs:
name: AutoBuild on ubuntu-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4.2.2

- name: Pack release version
run: dotnet pack --configuration Release

- uses: actions/setup-dotnet@v4.3.1
with:
dotnet-version: '6.0.x'
source-url: ${{ env.azure_artifacts_feed_url }}
env:
NUGET_AUTH_TOKEN: ${{ secrets.TASKS_TEST_FEED_API_KEY }}

- name: Pack release version
run: dotnet pack --configuration Release

# Setup dotnet again with test feed
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.x'
source-url: ${{ env.azure_artifacts_feed_url }}
env:
NUGET_AUTH_TOKEN: ${{ secrets.TASKS_TEST_FEED_API_KEY }}
# Push the package to the test feed
- name: Push NuGet package(s) to the test feed
run: dotnet nuget push bin/Release/frendstasktemplate.*.nupkg --api-key ${{ secrets.TASKS_TEST_FEED_API_KEY }} --source ${{ env.azure_artifacts_feed_url }} --skip-duplicate
- name: Push NuGet package(s) to the test feed
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 changes: 14 additions & 14 deletions .github/workflows/BuildMaster.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: BuildMaster.yml
name: BuildMaster

on:
push:
Expand All @@ -13,18 +13,18 @@ jobs:
name: Build master on ubuntu-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4.2.2

- name: Pack release version
run: dotnet pack --configuration Release
# Setup dotnet again with prod feed
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.x'
source-url: ${{ env.azure_artifacts_feed_url }}
env:
NUGET_AUTH_TOKEN: ${{ secrets.TASKS_FEED_API_KEY }}
- name: Push NuGet package(s) to the prod feed
run: dotnet nuget push bin/Release/frendstasktemplate.*.nupkg --api-key ${{ secrets.TASKS_FEED_API_KEY }} --source ${{ env.azure_artifacts_feed_url }}
- name: Pack release version
run: dotnet pack --configuration Release

- uses: actions/setup-dotnet@v4.3.1
with:
dotnet-version: '6.0.x'
source-url: ${{ env.azure_artifacts_feed_url }}
env:
NUGET_AUTH_TOKEN: ${{ secrets.TASKS_FEED_API_KEY }}

- name: Push NuGet package(s) to the prod feed
run: dotnet nuget push bin/Release/frendstasktemplate.*.nupkg --api-key ${{ secrets.TASKS_FEED_API_KEY }} --source ${{ env.azure_artifacts_feed_url }}

18 changes: 0 additions & 18 deletions .github/workflows/Execute_build_and_test_on_main.yml

This file was deleted.

18 changes: 0 additions & 18 deletions .github/workflows/Execute_build_and_test_on_push.yml

This file was deleted.

13 changes: 0 additions & 13 deletions .github/workflows/Execute_release.yml

This file was deleted.

Loading