Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Alineando develop version #39

Merged
merged 12 commits into from
Feb 29, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/alpha-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.301
dotnet-version: '8.0.x'
- name: Restore dependencies
run: dotnet restore
- name: Build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

strategy:
matrix:
dotnet: [ '3.1.x' ]
dotnet: [ '8.0.x' ]
agent: ['windows-2019','ubuntu-latest','macos-latest']

name: Build Start with ${{matrix.agent}}
Expand Down Expand Up @@ -56,4 +56,4 @@ jobs:
run: dotnet build -c ${{ env.BUILD_CONFIG }} --no-restore $PROJECT_PATH

- name: dotnet pack [$PROJECT_NAME]
run: dotnet pack $PROJECT_PATH -c ${{ env.BUILD_CONFIG }} --include-symbols -p:SymbolPackageFormat=snupkg -o ./artifacts
run: dotnet pack $PROJECT_PATH -c ${{ env.BUILD_CONFIG }} --include-symbols -p:SymbolPackageFormat=snupkg -o ./artifacts
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

strategy:
matrix:
dotnet: [ '3.1.x' ]
dotnet: [ '8.0.x' ]
agent: ['windows-2019','ubuntu-latest','macos-latest']

name: Build Start with ${{matrix.agent}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nuget-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

strategy:
matrix:
dotnet: [ '3.1.404']
dotnet: [ '8.0.x']

steps:
- name: Set env. aux vars
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nuget-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

strategy:
matrix:
dotnet: [ '3.1.404']
dotnet: [ '8.0.x']

steps:
- name: Set env. aux vars
Expand Down
24 changes: 19 additions & 5 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,35 @@
<Import Project="dependencies.props" />
<PropertyGroup>
<VersionPrefix>1</VersionPrefix>
<Version>$(VersionPrefix).1.0.0</Version>
<Version>$(VersionPrefix).2.4</Version>
<FileVersion>$(Version)</FileVersion>
<Company>René Pacios</Company>
<Copyright>Copyright © $(Company) - $([System.DateTime]::Now.Year)</Copyright>


</PropertyGroup>
<!--<PropertyGroup>
<LangVersion>8.0</LangVersion>
</PropertyGroup>-->

<PropertyGroup>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningsAsErrors></WarningsAsErrors>
</PropertyGroup>


<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<!--<DebugType>embedded</DebugType>-->
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
<PropertyGroup >
<!-- Condition="'$(GITHUB_ACTIONS)' == 'true'" -->
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
</PropertyGroup>
<ItemGroup>
<!-- https://github.com/dotnet/sourcelink/issues/572 -->
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
</ItemGroup>
</Project>
5 changes: 3 additions & 2 deletions Rene.Utils.Core.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.30114.105
# Visual Studio Version 17
VisualStudioVersion = 17.9.34607.119
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rene.Utils.Core", "src\Rene.Utils.Core\Rene.Utils.Core.csproj", "{C79F6350-F304-4135-9420-4D67A6B26099}"
EndProject
Expand All @@ -20,6 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets
.config\dotnet-tools.json = .config\dotnet-tools.json
LICENSE = LICENSE
README.md = README.md
EndProjectSection
EndProject
Expand Down
1 change: 0 additions & 1 deletion build/_

This file was deleted.

3 changes: 2 additions & 1 deletion dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
<PropertyGroup Label="SDK Versions">
<NetStandardTargetVersion>netstandard2.1</NetStandardTargetVersion>
<NetCoreTargetVersion>netcoreapp3.1</NetCoreTargetVersion>
<!--<LangVersion>8.0</LangVersion>-->
<LangVersion>8.0</LangVersion>
</PropertyGroup>


<PropertyGroup Label="Package Versions">
<FluentAssertions>5.10.3</FluentAssertions>
<Xunit>2.4.1</Xunit>
<SourceLinkGithub>8.0.0</SourceLinkGithub>
</PropertyGroup>

</Project>
98 changes: 59 additions & 39 deletions src/Rene.Utils.Core/Rene.Utils.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,48 +1,68 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Authors>René Pacios</Authors>
<Company>www.WebRene.es</Company>
<Product>DotNet Rene.Utils</Product>
<Description>Rene.Utils is a set of useful utilities and extensions of recurrent usage</Description>
<Copyright>Copyright 2018</Copyright>
<LicenseUrl>https://github.com/renepacios/DotNet.Rene.Utils/blob/main/LICENSE</LicenseUrl>
<PackageProjectUrl>https://github.com/renepacios/DotNet.Rene.Utils</PackageProjectUrl>
<RepositoryUrl>https://github.com/renepacios/DotNet.Rene.Utils</RepositoryUrl>
<PackageTags>Utils .NET Standard DotNetCore</PackageTags>
<NeutralLanguage>en</NeutralLanguage>
<!--<AssemblyVersion>$(FileVersion)</AssemblyVersion>
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Authors>René Pacios</Authors>
<Company>www.WebRene.es</Company>
<Product>DotNet Rene.Utils</Product>
<Description>Rene.Utils is a set of useful utilities and extensions of recurrent usage</Description>
<Copyright>Copyright 2018</Copyright>
<LicenseUrl>https://github.com/renepacios/DotNet.Rene.Utils/blob/main/LICENSE</LicenseUrl>
<PackageProjectUrl>https://github.com/renepacios/DotNet.Rene.Utils</PackageProjectUrl>
<RepositoryUrl>https://github.com/renepacios/DotNet.Rene.Utils</RepositoryUrl>
<PackageTags>Utils .NET Standard DotNetCore</PackageTags>
<NeutralLanguage>en</NeutralLanguage>
<!--<AssemblyVersion>$(FileVersion)</AssemblyVersion>
<FileVersion>$(FileVersion)</FileVersion>-->
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<VersionPrefix>$(VersionPrefix)</VersionPrefix>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<Version>$(Version)</Version>
<FileVersion>$(FileVersion)</FileVersion>
<LangVersion>8</LangVersion>
</PropertyGroup>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<VersionPrefix>$(VersionPrefix)</VersionPrefix>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<Version>$(Version)</Version>
<FileVersion>$(FileVersion)</FileVersion>
<LangVersion>$(LangVersion)</LangVersion>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<None Include="..\..\LICENSE">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<None Include="..\..\README.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

<ItemGroup>
<SourceRoot Include="$(MSBuildThisFileDirectory)/" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(SourceLinkGithub)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>


<ItemGroup>
<Compile Update="Resources\ExceptionMessages.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>ExceptionMessages.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Update="Resources\ExceptionMessages.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>ExceptionMessages.resx</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="Resources\ExceptionMessages.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>ExceptionMessages.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Resources\ExceptionMessages.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>ExceptionMessages.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(NetCoreTargetVersion)</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Version>$(Version)</Version>
<FileVersion>$(FileVersion)</FileVersion>
<IsPackable>false</IsPackable>
Expand Down
Loading