Skip to content

Commit

Permalink
Merge pull request #24 from SchwabenCode/feature/ci-for-main
Browse files Browse the repository at this point in the history
add ci for main
  • Loading branch information
BenjaminAbt authored Aug 24, 2024
2 parents 0574bd7 + 25f5f59 commit 287e5c7
Show file tree
Hide file tree
Showing 20 changed files with 67 additions and 55 deletions.
23 changes: 20 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ env:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true

jobs:
build:
runs-on: ubuntu-latest
build-win:
runs-on: windows-latest
steps:

- name: Cancel previous builds in PR
Expand Down Expand Up @@ -50,4 +50,21 @@ jobs:
run: dotnet pack
--configuration ${{ env.BuildConfig }}
/p:ContinuousIntegrationBuild=true
/p:Version=${{ steps.nbgv.outputs.NuGetPackageVersion }}
/p:Version=${{ steps.nbgv.outputs.NuGetPackageVersion }}

# - name: Update CHANGELOG
# id: changelog
# uses: requarks/changelog-action@v1
# with:
# token: ${{ github.token }}
# tag: ${{ github.ref_name }}

# - name: Create Release
# uses: ncipollo/[email protected]
# with:
# allowUpdates: true
# draft: false
# makeLatest: true
# name: ${{ github.ref_name }}
# body: ${{ steps.changelog.outputs.changes }}
# token: ${{ github.token }}
7 changes: 3 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"sdk": {
"version": "9.0.100-preview.6"
}
"sdk": {
"version": "9.0.100-preview.7.24407.12"
}
}
1 change: 1 addition & 0 deletions src/QuickIO/CodeTemplates/StaticFileTimeMethods.tt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ var dateTimeReturnValueText = "A <see cref=\"DateTime\"/> structure.";

using System;
using SchwabenCode.QuickIO.Internal;
using SchwabenCode.QuickIO.Win32API;

namespace SchwabenCode.QuickIO;

Expand Down
8 changes: 8 additions & 0 deletions src/QuickIO/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
MIT License
Copyright (c) 2013-2024 Benjamin Abt

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22 changes: 0 additions & 22 deletions src/QuickIO/License.txt

This file was deleted.

10 changes: 9 additions & 1 deletion src/QuickIO/QuickIO.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@
<IsPackable>true</IsPackable>
<PackageReadmeFile>readme.md</PackageReadmeFile>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup Label="Package Details">
<None Include="readme.md" Pack="true" PackagePath="" />
<None Include="LICENSE.txt" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup Label="NuGet">
<PackageReference Include="T4.Build" PrivateAssets="All" />
</ItemGroup>
Expand Down Expand Up @@ -188,4 +192,8 @@
<DependentUpon>QuickIOFile_Root_Async.tt</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/QuickIO/QuickIODirectory_Attributes.tt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<#@ template language="C#" hostspecific="true" #>
<#@ include file=".\CodeTemplates\SaveOutput.tt" #>
<#@ include file=".\CodeTemplates\StaticAttributeMethods.tt" #>
<#@ include file="CodeTemplates/SaveOutput.tt" #>
<#@ include file="CodeTemplates/StaticAttributeMethods.tt" #>
<#@ output extension=".cs" #>
<#
Generate("QuickIODirectory");
Expand Down
1 change: 1 addition & 0 deletions src/QuickIO/QuickIODirectory_Attributes_Async.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

// ------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a T4 template.
Expand Down
4 changes: 2 additions & 2 deletions src/QuickIO/QuickIODirectory_Attributes_Async.tt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<#@ template language="C#" hostspecific="true" #>
<#@ include file=".\CodeTemplates\SaveOutput.tt" #>
<#@ include file=".\CodeTemplates\StaticAttributeMethods_Async.tt" #>
<#@ include file="CodeTemplates/SaveOutput.tt" #>
<#@ include file="CodeTemplates/StaticAttributeMethods_Async.tt" #>
<#@ output extension=".cs" #>
<#
Generate("QuickIODirectory");
Expand Down
4 changes: 2 additions & 2 deletions src/QuickIO/QuickIODirectory_FileTime.tt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<#@ template language="C#" hostspecific="true" #>
<#@ include file=".\CodeTemplates\SaveOutput.tt" #>
<#@ include file=".\CodeTemplates\StaticFileTimeMethods.tt" #>
<#@ include file="CodeTemplates/SaveOutput.tt" #>
<#@ include file="CodeTemplates/StaticFileTimeMethods.tt" #>
<#@ output extension=".cs" #>
<#
Generate("QuickIODirectory");
Expand Down
4 changes: 2 additions & 2 deletions src/QuickIO/QuickIODirectory_FileTime_Async.tt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<#@ template language="C#" hostspecific="true" #>
<#@ include file=".\CodeTemplates\SaveOutput.tt" #>
<#@ include file=".\CodeTemplates\StaticFileTimeMethods_Async.tt" #>
<#@ include file="CodeTemplates/SaveOutput.tt" #>
<#@ include file="CodeTemplates/StaticFileTimeMethods_Async.tt" #>
<#@ output extension=".cs" #>
<#
Generate("QuickIODirectory");
Expand Down
4 changes: 2 additions & 2 deletions src/QuickIO/QuickIODirectory_Root.tt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<#@ template language="C#" hostspecific="true" #>
<#@ include file=".\CodeTemplates\SaveOutput.tt" #>
<#@ include file=".\CodeTemplates\StaticRootMethods.tt" #>
<#@ include file="CodeTemplates/SaveOutput.tt" #>
<#@ include file="CodeTemplates/StaticRootMethods.tt" #>
<#@ output extension=".cs" #>
<#
Generate("QuickIODirectory");
Expand Down
4 changes: 2 additions & 2 deletions src/QuickIO/QuickIODirectory_Root_Async.tt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<#@ template language="C#" hostspecific="true" #>
<#@ include file=".\CodeTemplates\SaveOutput.tt" #>
<#@ include file=".\CodeTemplates\StaticRootMethods_Async.tt" #>
<#@ include file="CodeTemplates/SaveOutput.tt" #>
<#@ include file="CodeTemplates/StaticRootMethods_Async.tt" #>
<#@ output extension=".cs" #>
<#
Generate("QuickIODirectory");
Expand Down
4 changes: 2 additions & 2 deletions src/QuickIO/QuickIOFile_Attributes.tt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<#@ template language="C#" hostspecific="true" #>
<#@ include file=".\CodeTemplates\SaveOutput.tt" #>
<#@ include file=".\CodeTemplates\StaticAttributeMethods.tt" #>
<#@ include file="CodeTemplates/SaveOutput.tt" #>
<#@ include file="CodeTemplates/StaticAttributeMethods.tt" #>
<#@ output extension=".cs" #>
<#
Generate("QuickIOFile");
Expand Down
4 changes: 2 additions & 2 deletions src/QuickIO/QuickIOFile_Attributes_Async.tt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<#@ template language="C#" hostspecific="true" #>
<#@ include file=".\CodeTemplates\SaveOutput.tt" #>
<#@ include file=".\CodeTemplates\StaticAttributeMethods_Async.tt" #>
<#@ include file="CodeTemplates/SaveOutput.tt" #>
<#@ include file="CodeTemplates/StaticAttributeMethods_Async.tt" #>
<#@ output extension=".cs" #>
<#
Generate("QuickIOFile");
Expand Down
4 changes: 2 additions & 2 deletions src/QuickIO/QuickIOFile_FileTime.tt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<#@ template language="C#" hostspecific="true" #>
<#@ include file=".\CodeTemplates\SaveOutput.tt" #>
<#@ include file=".\CodeTemplates\StaticFileTimeMethods.tt" #>
<#@ include file="CodeTemplates/SaveOutput.tt" #>
<#@ include file="CodeTemplates/StaticFileTimeMethods.tt" #>
<#@ output extension=".cs" #>
<#
Generate("QuickIOFile");
Expand Down
4 changes: 2 additions & 2 deletions src/QuickIO/QuickIOFile_FileTime_Async.tt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<#@ template language="C#" hostspecific="true" #>
<#@ include file=".\CodeTemplates\SaveOutput.tt" #>
<#@ include file=".\CodeTemplates\StaticFileTimeMethods_Async.tt" #>
<#@ include file="CodeTemplates/SaveOutput.tt" #>
<#@ include file="CodeTemplates/StaticFileTimeMethods_Async.tt" #>
<#@ output extension=".cs" #>
<#
Generate("QuickIOFile");
Expand Down
4 changes: 2 additions & 2 deletions src/QuickIO/QuickIOFile_Root.tt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<#@ template language="C#" hostspecific="true" #>
<#@ include file=".\CodeTemplates\SaveOutput.tt" #>
<#@ include file=".\CodeTemplates\StaticRootMethods.tt" #>
<#@ include file="CodeTemplates/SaveOutput.tt" #>
<#@ include file="CodeTemplates/StaticRootMethods.tt" #>
<#@ output extension=".cs" #>
<#
Generate("QuickIOFile");
Expand Down
4 changes: 2 additions & 2 deletions src/QuickIO/QuickIOFile_Root_Async.tt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<#@ template language="C#" hostspecific="true" #>
<#@ include file=".\CodeTemplates\SaveOutput.tt" #>
<#@ include file=".\CodeTemplates\StaticRootMethods_Async.tt" #>
<#@ include file="CodeTemplates/SaveOutput.tt" #>
<#@ include file="CodeTemplates/StaticRootMethods_Async.tt" #>
<#@ output extension=".cs" #>
<#
Generate("QuickIOFile");
Expand Down
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"semVer": 1 // optional. Set to either 1 or 2 to control how the NuGet package version string is generated. Default is 1.
},
"publicReleaseRefSpec": [
"^refs/heads/master", // we release out of master
"^refs/heads/main", // we release out of main
"^refs/tags/v\\d+\\.\\d+" // we also release tags starting with vN.N
],
"cloudBuild": {
Expand Down

0 comments on commit 287e5c7

Please sign in to comment.