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.

Sign up for GitHub

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

Addressed a compiler error, changes the project icon url to use embedded icon, and added additional target framework #200

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Addressed a compiler error, changes the project icon url to use embedded icon, and added additional target framework #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/IniParser.Example/IniParser.Example.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<!-- Auto-select supported target frameworks based on MSBuild version -->
<PropertyGroup Condition="'$(MSBuildRuntimeType)'=='Core'">
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>netcoreapp2.0;netcoreapp3.1</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition="'$(MSBuildRuntimeType)'!='Core'">
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
Expand Down
4 changes: 2 additions & 2 deletions src/IniParser.Tests/IniParser.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

<!-- Auto-select supported target frameworks based on MSBuild version -->
<PropertyGroup Condition="'$(MSBuildRuntimeType)'=='Core'">
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>netcoreapp2.0;netcoreapp3.1</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition="'$(MSBuildRuntimeType)'!='Core'">
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.0;netcoreapp3.1</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/IniParser/IniDataParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ protected virtual bool ProcessComment(StringBuffer currentLine)
// the comment delimiter
var startIdx = commentRange.start + Scheme.CommentString.Length;
var size = currentLineTrimmed.Count - Scheme.CommentString.Length;
var range = Range.FromIndexWithSize(startIdx, size);
var range = IniParser.Parser.StringBuffer.Range.FromIndexWithSize(startIdx, size);

var comment = currentLineTrimmed.Substring(range);
if (Configuration.TrimComments)
Expand Down Expand Up @@ -345,10 +345,10 @@ protected virtual bool ProcessProperty(StringBuffer currentLine, IniData iniData

if (propertyAssigmentIdx.IsEmpty) return false;

var keyRange = Range.WithIndexes(0, propertyAssigmentIdx.start - 1);
var keyRange = IniParser.Parser.StringBuffer.Range.WithIndexes(0, propertyAssigmentIdx.start - 1);
var valueStartIdx = propertyAssigmentIdx.end + 1;
var valueSize = currentLine.Count - propertyAssigmentIdx.end - 1;
var valueRange = Range.FromIndexWithSize(valueStartIdx, valueSize);
var valueRange = IniParser.Parser.StringBuffer.Range.FromIndexWithSize(valueStartIdx, valueSize);

var key = currentLine.Substring(keyRange);
var value = currentLine.Substring(valueRange);
Expand Down
6 changes: 3 additions & 3 deletions src/IniParser/IniParser.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Also implements merging operations, both for complete ini files, sections, or ev
<Authors>Ricardo Amores Hernández</Authors>
<PackageProjectUrl>https://github.com/rickyah/ini-parser</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIconUrl>https://raw.githubusercontent.com/rickyah/ini-parser/development/nuget-ini-icon.png</PackageIconUrl>
<PackageIconUrl>../../nuget-ini-icon.png</PackageIconUrl>
<Version>3.0</Version>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>Properties\publickey.snk</AssemblyOriginatorKeyFile>
Expand All @@ -27,12 +27,12 @@ Also implements merging operations, both for complete ini files, sections, or ev

<!-- Auto-select supported target frameworks based on MSBuild version -->
<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
<RepositoryUrl>https://github.com/rickyah/ini-parser</RepositoryUrl>
<Copyright>Ricardo Amores Hernández 2009-2019</Copyright>
</PropertyGroup>
<!-- Only generate NuGet package for full builds -->
<PropertyGroup Condition="'$(MSBuildRuntimeType)'=='Full'">
<PropertyGroup>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
</PropertyGroup>
</Project>