Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
kekyo committed Oct 25, 2023
2 parents 1a85b09 + 148b39e commit 18952c4
Show file tree
Hide file tree
Showing 24 changed files with 81 additions and 78 deletions.
45 changes: 16 additions & 29 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
#-----------------------------------------------------------------------
# Checkout

- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
# lfs: true
Expand All @@ -27,49 +27,36 @@ jobs:
#-----------------------------------------------------------------------
# Setup environments

- name: Setup .NET 2.2
uses: actions/setup-dotnet@v1
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 2.2.*
- name: Setup .NET 3.1
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.*
- name: Setup .NET 5
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.*
- name: Setup .NET 6
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.*
- name: Setup .NET 7
uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.*

- name: Setup NuGet package reference
run: |
dotnet-version: |
2.2.x
3.1.x
5.0.x
6.0.x
7.0.x
8.0.x
# - name: Setup NuGet package reference
# run: |
# dotnet nuget add source ${{secrets.GH_LOCAL_NUGET_URL}} -n ref1 -u ${{secrets.GH_LOCAL_NUGET_USER}} -p ${{secrets.GH_LOCAL_NUGET_PASSWORD}} --store-password-in-clear-text --configfile nuget.config
# dotnet nuget add source ${{secrets.GH_NUGET_URL}} -n ref2 -u ${{secrets.GH_NUGET_USER}} -p ${{secrets.GH_NUGET_PASSWORD}} --store-password-in-clear-text --configfile nuget.config

#-----------------------------------------------------------------------
# Build

- name: NuGet restore
run: dotnet restore -p:Configuration=Release CenterCLR.NamingFormatter.sln

- name: Build
run: dotnet build -p:Configuration=Release -p:BuildIdentifier=${GITHUB_RUN_NUMBER} CenterCLR.NamingFormatter.sln
run: dotnet build -p:Configuration=Release -p:Platform="Any CPU" -p:RestoreNoCache=True -p:BuildIdentifier=${GITHUB_RUN_NUMBER} NamingFormatter.sln

- name: Build NuGet packages
run: dotnet pack -p:Configuration=Release -p:BuildIdentifier=${GITHUB_RUN_NUMBER} -o artifacts CenterCLR.NamingFormatter.sln
run: dotnet pack -p:Configuration=Release -p:Platform="Any CPU" -p:BuildIdentifier=${GITHUB_RUN_NUMBER} -o artifacts NamingFormatter.sln

#-----------------------------------------------------------------------
# Test

- name: Test
run: dotnet test --no-restore --verbosity normal -p:CITest=True CenterCLR.NamingFormatter.sln
run: dotnet test --no-restore --verbosity normal -p:CITest=True NamingFormatter.sln
timeout-minutes: 2

#-----------------------------------------------------------------------
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes.
14 changes: 7 additions & 7 deletions CenterCLR.NamingFormatter.sln → NamingFormatter.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29123.88
# Visual Studio Version 17
VisualStudioVersion = 17.0.32014.148
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{25BEB179-DC2D-443C-8BD7-F51CF04DE053}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -13,15 +13,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Images", "Images", "{FA746D2D-0859-4AD9-AC64-6E1A58A6EB00}"
ProjectSection(SolutionItems) = preProject
Images\CenterCLR.NamingFormatter.100.png = Images\CenterCLR.NamingFormatter.100.png
Images\CenterCLR.NamingFormatter.128.png = Images\CenterCLR.NamingFormatter.128.png
Images\CenterCLR.NamingFormatter.design = Images\CenterCLR.NamingFormatter.design
Images\NamingFormatter.100.png = Images\NamingFormatter.100.png
Images\NamingFormatter.128.png = Images\NamingFormatter.128.png
Images\NamingFormatter.design = Images\NamingFormatter.design
Images\Japanese.256.png = Images\Japanese.256.png
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CenterCLR.NamingFormatter", "CenterCLR.NamingFormatter\CenterCLR.NamingFormatter.csproj", "{53446020-7743-4188-8049-F536C1A92E74}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NamingFormatter", "NamingFormatter\NamingFormatter.csproj", "{53446020-7743-4188-8049-F536C1A92E74}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CenterCLR.NamingFormatterTests", "CenterCLR.NamingFormatterTests\CenterCLR.NamingFormatterTests.csproj", "{DC865092-C422-42B4-97D3-CACB3A289164}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NamingFormatterTests", "NamingFormatterTests\NamingFormatterTests.csproj", "{DC865092-C422-42B4-97D3-CACB3A289164}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////
//
// CenterCLR.NamingFormatter - String format library with key-valued replacer.
// NamingFormatter - String format library with key-valued replacer.
// Copyright (c) 2016-2019 Kouji Matsui (@kekyo2)
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////
//
// CenterCLR.NamingFormatter - String format library with key-valued replacer.
// NamingFormatter - String format library with key-valued replacer.
// Copyright (c) 2016-2019 Kouji Matsui (@kekyo2)
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////
//
// CenterCLR.NamingFormatter - String format library with key-valued replacer.
// NamingFormatter - String format library with key-valued replacer.
// Copyright (c) 2016-2019 Kouji Matsui (@kekyo2)
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////
//
// CenterCLR.NamingFormatter - String format library with key-valued replacer.
// NamingFormatter - String format library with key-valued replacer.
// Copyright (c) 2016-2019 Kouji Matsui (@kekyo2)
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////
//
// CenterCLR.NamingFormatter - String format library with key-valued replacer.
// NamingFormatter - String format library with key-valued replacer.
// Copyright (c) 2016-2019 Kouji Matsui (@kekyo2)
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////
//
// CenterCLR.NamingFormatter - String format library with key-valued replacer.
// NamingFormatter - String format library with key-valued replacer.
// Copyright (c) 2016-2019 Kouji Matsui (@kekyo2)
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////
//
// CenterCLR.NamingFormatter - String format library with key-valued replacer.
// NamingFormatter - String format library with key-valued replacer.
// Copyright (c) 2016-2019 Kouji Matsui (@kekyo2)
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////
//
// CenterCLR.NamingFormatter - String format library with key-valued replacer.
// NamingFormatter - String format library with key-valued replacer.
// Copyright (c) 2016-2019 Kouji Matsui (@kekyo2)
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////
//
// CenterCLR.NamingFormatter - String format library with key-valued replacer.
// NamingFormatter - String format library with key-valued replacer.
// Copyright (c) 2016-2019 Kouji Matsui (@kekyo2)
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,36 +1,40 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net35;net40-client;net45;net461;net47;net48;net481;netstandard1.0;netstandard2.0;netstandard2.1;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net35;net40-client;net45;net461;net47;net48;net481;netstandard1.0;netstandard2.0;netstandard2.1;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>

<OutputType>Library</OutputType>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>

<DebugSymbols>true</DebugSymbols>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);CS1570;CS1591;CA1416;CS8981</NoWarn>

<RootNamespace>NamingFormatter</RootNamespace>
<AssemblyName>NamingFormatter</AssemblyName>
<AssemblyTitle>String format library with key-valued replacer.</AssemblyTitle>

<Product>NamingFormatter</Product>
<Trademark>NamingFormatter</Trademark>
<Copyright>Copyright (c) Kouji Matsui</Copyright>
<Description>String format library with key-valued replacer.</Description>
<Company>Kouji Matsui (@kozy_kekyo)</Company>
<Authors>Kouji Matsui (@kozy_kekyo)</Authors>

<Company>Kouji Matsui (@kozy_kekyo, @[email protected])</Company>
<Authors>Kouji Matsui (@kozy_kekyo, @[email protected])</Authors>
<RepositoryType>git</RepositoryType>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/kekyo/CenterCLR.NamingFormatter</PackageProjectUrl>
<PackageIcon>CenterCLR.NamingFormatter.100.png</PackageIcon>
<RepositoryUrl>https://github.com/kekyo/CenterCLR.NamingFormatter</RepositoryUrl>
<PackageTags>string;formatter;extensible;key-value;replace;same;option;structural</PackageTags>
<DebugSymbols>true</DebugSymbols>
<PackageProjectUrl>https://github.com/kekyo/NamingFormatter</PackageProjectUrl>
<PackageIcon>NamingFormatter.100.png</PackageIcon>
<RepositoryUrl>https://github.com/kekyo/NamingFormatter</RepositoryUrl>
<PackageTags>string;formatter;dynamic;extensible;key-value;replace;structural</PackageTags>
<AllowedOutputExtensionsInPackageBuildOutputFolder>.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<NoWarn>$(NoWarn);NU1605;NU1701;NU1803</NoWarn>
<NoWarn>$(NoWarn);NU1605;NU1701;NU1803;NU1902;NU1903</NoWarn>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net40-client'">
Expand All @@ -51,11 +55,13 @@
<Deterministic>true</Deterministic>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
<RepoRoot>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))</RepoRoot>
<PathMap>$(RepoRoot)=.</PathMap>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
<PackageReference Include="RelaxVersioner" Version="2.14.0" PrivateAssets="all" />
<PackageReference Include="RelaxVersioner" Version="3.2.40" PrivateAssets="all" />
</ItemGroup>

<ItemGroup Condition="('$(TargetFramework)' != 'net35') AND ('$(TargetFramework)' != 'net40-client') AND ('$(TargetFramework)' != 'netstandard2.0') AND ('$(TargetFramework)' != 'netstandard2.1') AND ('$(TargetFrameworkIdentifier)' != '.NETCoreApp')">
Expand All @@ -67,7 +73,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\Images\CenterCLR.NamingFormatter.100.png" Link="Images\CenterCLR.NamingFormatter.100.png" Pack="true" PackagePath="\" />
<None Include="..\Images\NamingFormatter.100.png" Link="Images\NamingFormatter.100.png" Pack="true" PackagePath="\" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////
//
// CenterCLR.NamingFormatter - String format library with key-valued replacer.
// NamingFormatter - String format library with key-valued replacer.
// Copyright (c) 2016-2019 Kouji Matsui (@kekyo2)
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////
//
// CenterCLR.NamingFormatter - String format library with key-valued replacer.
// NamingFormatter - String format library with key-valued replacer.
// Copyright (c) 2016-2019 Kouji Matsui (@kekyo2)
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////
//
// CenterCLR.NamingFormatter - String format library with key-valued replacer.
// NamingFormatter - String format library with key-valued replacer.
// Copyright (c) 2016 Kouji Matsui (@kekyo2)
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////
//
// CenterCLR.NamingFormatter - String format library with key-valued replacer.
// NamingFormatter - String format library with key-valued replacer.
// Copyright (c) 2016 Kouji Matsui (@kekyo2)
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net35;net40;net48;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net35;net40;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>

<OutputType>Library</OutputType>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<NoWarn>$(NoWarn);CS1570;CS1591;CA1416;CS8981</NoWarn>

<RootNamespace>NamingFormatter</RootNamespace>
<AssemblyName>NamingFormatterTests</AssemblyName>
<AssemblyTitle>String format library with key-valued replacer.</AssemblyTitle>
Expand All @@ -19,11 +21,12 @@
<Company>Kouji Matsui (@kozy_kekyo)</Company>
<Authors>Kouji Matsui (@kozy_kekyo)</Authors>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/kekyo/CenterCLR.NamingFormatter</RepositoryUrl>
<RepositoryUrl>https://github.com/kekyo/NamingFormatter</RepositoryUrl>
<DebugType>portable</DebugType>
<DebugSymbols>true</DebugSymbols>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<NoWarn>$(NoWarn);NU1605;NU1701;NU1803</NoWarn>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<NoWarn>$(NoWarn);NU1605;NU1701;NU1803;NU1902;NU1903</NoWarn>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net40'">
Expand All @@ -46,7 +49,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\CenterCLR.NamingFormatter\CenterCLR.NamingFormatter.csproj" />
<ProjectReference Include="..\NamingFormatter\NamingFormatter.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////
//
// CenterCLR.NamingFormatter - String format library with key-valued replacer.
// NamingFormatter - String format library with key-valued replacer.
// Copyright (c) 2016 Kouji Matsui (@kekyo2)
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////
//
// CenterCLR.NamingFormatter - String format library with key-valued replacer.
// NamingFormatter - String format library with key-valued replacer.
// Copyright (c) 2016 Kouji Matsui (@kekyo2)
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# NamingFormatter

![NamingFormatter](https://raw.githubusercontent.com/kekyo/CenterCLR.NamingFormatter/master/Images/CenterCLR.NamingFormatter.128.png)
![NamingFormatter](https://raw.githubusercontent.com/kekyo/NamingFormatter/master/Images/NamingFormatter.128.png)

## Status

[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)

| |Build|NuGet|
|:----|:----|:----|
|master|[![NamingFormatter CI build (master)](https://github.com/kekyo/CenterCLR.NamingFormatter/workflows/.NET/badge.svg?branch=master)](https://github.com/kekyo/CenterCLR.NamingFormatter/actions)|[![NuGet NamingFormatter (master)](https://img.shields.io/nuget/v/NamingFormatter.svg?style=flat)](https://www.nuget.org/packages/NamingFormatter)|
|devel|[![NamingFormatter CI build (master)](https://github.com/kekyo/CenterCLR.NamingFormatter/workflows/.NET/badge.svg?branch=master)](https://github.com/kekyo/CenterCLR.NamingFormatter/actions)|[![MyGet NamingFormatter (devel)](https://img.shields.io/myget/kekyo/v/NamingFormatter.svg?style=flat&label=myget)](https://www.myget.org/feed/kekyo/package/nuget/NamingFormatter)|
|master|[![NamingFormatter CI build (master)](https://github.com/kekyo/NamingFormatter/workflows/.NET/badge.svg?branch=master)](https://github.com/kekyo/NamingFormatter/actions)|[![NuGet NamingFormatter (master)](https://img.shields.io/nuget/v/NamingFormatter.svg?style=flat)](https://www.nuget.org/packages/NamingFormatter)|
|devel|[![NamingFormatter CI build (master)](https://github.com/kekyo/NamingFormatter/workflows/.NET/badge.svg?branch=master)](https://github.com/kekyo/NamingFormatter/actions)|[![MyGet NamingFormatter (devel)](https://img.shields.io/myget/kekyo/v/NamingFormatter.svg?style=flat&label=myget)](https://www.myget.org/feed/kekyo/package/nuget/NamingFormatter)|

## What is this?

Expand Down Expand Up @@ -83,7 +83,7 @@ var formatted = Named.Format(

## Environments

* .NET 7 to 5
* .NET 8 to 5
* .NET Standard 1.0, 2.0, 2.1 (Will effect .NET Core 1.0-3.1)
* .NET Framework 3.5, 4.0 with client profile, 4.5 to 4.8.1

Expand Down Expand Up @@ -199,6 +199,8 @@ var formatted = Named.Format(

## History

* 2.3.0:
* Added .NET 8.0 RC2 assembly.
* 2.2.0:
* Added field lookup ability.
* Reduced package dependency.
Expand All @@ -214,7 +216,7 @@ var formatted = Named.Format(
* Added asynchronous overloads.
* 2.0.16: Fixed not including net35 assembly.
* 2.0.15:
* Breaking change: Changed the NuGet package name from "CenterCLR.NamingFormatter" to "NamingFormatter".
* Breaking change: Changed the NuGet package name from "NamingFormatter" to "NamingFormatter".
* Breaking change: Changed namespace name from "CenterCLR" to "NamingFormatter".
* Added some target frameworks.
* Omitted strong-key signing.
Expand Down
Loading

0 comments on commit 18952c4

Please sign in to comment.