Skip to content

Commit

Permalink
Updated package info (#6)
Browse files Browse the repository at this point in the history 
Also, renamed projects' folder
  • Loading branch information
@Kralizek
Kralizek authored Jun 10, 2021
1 parent 9c6694e commit 1f5a6fe
Show file tree
Hide file tree
Showing 15 changed files with 62 additions and 48 deletions.
66 changes: 33 additions & 33 deletions ObjectConfigurationExtensions.sln
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26124.0
MinimumVisualStudioVersion = 15.0.26124.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EA1F1988-0986-46FC-86AD-C247411FD261}"
# Visual Studio Version 16
VisualStudioVersion = 16.6.30114.105
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{49A4B4B5-2EF8-422F-BC13-1622A3131D85}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kralizek.Extensions.Configuration.Objects", "src\Kralizek.Extensions.Configuration.Objects\Kralizek.Extensions.Configuration.Objects.csproj", "{EB691E28-C867-4150-9231-A73B900E363E}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Objects", "src\Objects\Objects.csproj", "{A5A06279-A908-4B4D-A91B-919BDD4E2957}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{156B8D40-B745-43A2-BA17-8BF5798384D8}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7D89563A-B6B2-46E0-A640-E34CC6A2078A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.Extensions.Configuration.Objects", "tests\Tests.Extensions.Configuration.Objects\Tests.Extensions.Configuration.Objects.csproj", "{8120109C-95BC-423F-BBB2-91037E00F986}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.Objects", "tests\Tests.Objects\Tests.Objects.csproj", "{06A9F0F7-10D7-4531-A346-2A18C5402C54}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -24,33 +24,33 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EB691E28-C867-4150-9231-A73B900E363E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EB691E28-C867-4150-9231-A73B900E363E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EB691E28-C867-4150-9231-A73B900E363E}.Debug|x64.ActiveCfg = Debug|Any CPU
{EB691E28-C867-4150-9231-A73B900E363E}.Debug|x64.Build.0 = Debug|Any CPU
{EB691E28-C867-4150-9231-A73B900E363E}.Debug|x86.ActiveCfg = Debug|Any CPU
{EB691E28-C867-4150-9231-A73B900E363E}.Debug|x86.Build.0 = Debug|Any CPU
{EB691E28-C867-4150-9231-A73B900E363E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EB691E28-C867-4150-9231-A73B900E363E}.Release|Any CPU.Build.0 = Release|Any CPU
{EB691E28-C867-4150-9231-A73B900E363E}.Release|x64.ActiveCfg = Release|Any CPU
{EB691E28-C867-4150-9231-A73B900E363E}.Release|x64.Build.0 = Release|Any CPU
{EB691E28-C867-4150-9231-A73B900E363E}.Release|x86.ActiveCfg = Release|Any CPU
{EB691E28-C867-4150-9231-A73B900E363E}.Release|x86.Build.0 = Release|Any CPU
{8120109C-95BC-423F-BBB2-91037E00F986}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8120109C-95BC-423F-BBB2-91037E00F986}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8120109C-95BC-423F-BBB2-91037E00F986}.Debug|x64.ActiveCfg = Debug|Any CPU
{8120109C-95BC-423F-BBB2-91037E00F986}.Debug|x64.Build.0 = Debug|Any CPU
{8120109C-95BC-423F-BBB2-91037E00F986}.Debug|x86.ActiveCfg = Debug|Any CPU
{8120109C-95BC-423F-BBB2-91037E00F986}.Debug|x86.Build.0 = Debug|Any CPU
{8120109C-95BC-423F-BBB2-91037E00F986}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8120109C-95BC-423F-BBB2-91037E00F986}.Release|Any CPU.Build.0 = Release|Any CPU
{8120109C-95BC-423F-BBB2-91037E00F986}.Release|x64.ActiveCfg = Release|Any CPU
{8120109C-95BC-423F-BBB2-91037E00F986}.Release|x64.Build.0 = Release|Any CPU
{8120109C-95BC-423F-BBB2-91037E00F986}.Release|x86.ActiveCfg = Release|Any CPU
{8120109C-95BC-423F-BBB2-91037E00F986}.Release|x86.Build.0 = Release|Any CPU
{A5A06279-A908-4B4D-A91B-919BDD4E2957}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A5A06279-A908-4B4D-A91B-919BDD4E2957}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A5A06279-A908-4B4D-A91B-919BDD4E2957}.Debug|x64.ActiveCfg = Debug|Any CPU
{A5A06279-A908-4B4D-A91B-919BDD4E2957}.Debug|x64.Build.0 = Debug|Any CPU
{A5A06279-A908-4B4D-A91B-919BDD4E2957}.Debug|x86.ActiveCfg = Debug|Any CPU
{A5A06279-A908-4B4D-A91B-919BDD4E2957}.Debug|x86.Build.0 = Debug|Any CPU
{A5A06279-A908-4B4D-A91B-919BDD4E2957}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A5A06279-A908-4B4D-A91B-919BDD4E2957}.Release|Any CPU.Build.0 = Release|Any CPU
{A5A06279-A908-4B4D-A91B-919BDD4E2957}.Release|x64.ActiveCfg = Release|Any CPU
{A5A06279-A908-4B4D-A91B-919BDD4E2957}.Release|x64.Build.0 = Release|Any CPU
{A5A06279-A908-4B4D-A91B-919BDD4E2957}.Release|x86.ActiveCfg = Release|Any CPU
{A5A06279-A908-4B4D-A91B-919BDD4E2957}.Release|x86.Build.0 = Release|Any CPU
{06A9F0F7-10D7-4531-A346-2A18C5402C54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{06A9F0F7-10D7-4531-A346-2A18C5402C54}.Debug|Any CPU.Build.0 = Debug|Any CPU
{06A9F0F7-10D7-4531-A346-2A18C5402C54}.Debug|x64.ActiveCfg = Debug|Any CPU
{06A9F0F7-10D7-4531-A346-2A18C5402C54}.Debug|x64.Build.0 = Debug|Any CPU
{06A9F0F7-10D7-4531-A346-2A18C5402C54}.Debug|x86.ActiveCfg = Debug|Any CPU
{06A9F0F7-10D7-4531-A346-2A18C5402C54}.Debug|x86.Build.0 = Debug|Any CPU
{06A9F0F7-10D7-4531-A346-2A18C5402C54}.Release|Any CPU.ActiveCfg = Release|Any CPU
{06A9F0F7-10D7-4531-A346-2A18C5402C54}.Release|Any CPU.Build.0 = Release|Any CPU
{06A9F0F7-10D7-4531-A346-2A18C5402C54}.Release|x64.ActiveCfg = Release|Any CPU
{06A9F0F7-10D7-4531-A346-2A18C5402C54}.Release|x64.Build.0 = Release|Any CPU
{06A9F0F7-10D7-4531-A346-2A18C5402C54}.Release|x86.ActiveCfg = Release|Any CPU
{06A9F0F7-10D7-4531-A346-2A18C5402C54}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{EB691E28-C867-4150-9231-A73B900E363E} = {EA1F1988-0986-46FC-86AD-C247411FD261}
{8120109C-95BC-423F-BBB2-91037E00F986} = {156B8D40-B745-43A2-BA17-8BF5798384D8}
{A5A06279-A908-4B4D-A91B-919BDD4E2957} = {49A4B4B5-2EF8-422F-BC13-1622A3131D85}
{06A9F0F7-10D7-4531-A346-2A18C5402C54} = {7D89563A-B6B2-46E0-A640-E34CC6A2078A}
EndGlobalSection
EndGlobal
19 changes: 11 additions & 8 deletions build.cake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,15 @@ Task("Version")
{
var version = GitVersion();

var packageVersion = version.SemVer;
var buildVersion = $"{version.FullSemVer}+{DateTimeOffset.UtcNow:yyyyMMddHHmmss}";

state.Version = new VersionInfo
{
PackageVersion = packageVersion,
BuildVersion = buildVersion
PackageVersion = version.SemVer,
AssemblyVersion = $"{version.SemVer}+{version.Sha.Substring(0, 8)}",
BuildVersion = $"{version.FullSemVer}+{version.Sha.Substring(0, 8)}-{DateTimeOffset.UtcNow:yyyyMMddHHmmss}"
};


Information($"Package version: {state.Version.PackageVersion}");
Information($"Assembly version: {state.Version.AssemblyVersion}");
Information($"Build version: {state.Version.BuildVersion}");

if (BuildSystem.IsRunningOnAppVeyor)
Expand Down Expand Up @@ -196,7 +194,10 @@ Task("PackLibraries")
NoRestore = true,
OutputDirectory = state.Paths.OutputFolder,
IncludeSymbols = true,
ArgumentCustomization = args => args.Append($"-p:SymbolPackageFormat=snupkg -p:Version={state.Version.PackageVersion}")
MSBuildSettings = new DotNetCoreMSBuildSettings()
.SetInformationalVersion(state.Version.AssemblyVersion)
.SetVersion(state.Version.PackageVersion)
.WithProperty("ContinuousIntegrationBuild", "true")
};

DotNetCorePack(state.Paths.SolutionFile.ToString(), settings);
Expand Down Expand Up @@ -284,5 +285,7 @@ public class VersionInfo
{
public string PackageVersion { get; set; }

public string BuildVersion {get; set; }
public string AssemblyVersion { get; set; }

public string BuildVersion { get; set; }
}
0 ...s/Internal/JsonConfigurationSerializer.cs → ...s/Internal/JsonConfigurationSerializer.cs
View file
File renamed without changes.
0 ...s/Internal/ObjectConfigurationProvider.cs → ...s/Internal/ObjectConfigurationProvider.cs
View file
File renamed without changes.
0 ...cts/Internal/ObjectConfigurationSource.cs → ...cts/Internal/ObjectConfigurationSource.cs
View file
File renamed without changes.
0 ....Objects/ObjectConfigurationExtensions.cs → src/Objects/ObjectConfigurationExtensions.cs
View file
File renamed without changes.
23 changes: 17 additions & 6 deletions ...k.Extensions.Configuration.Objects.csproj → src/Objects/Objects.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<RootNamespace>Kralizek.Extensions.Configuration</RootNamespace>
<AssemblyName>Kralizek.Extensions.Configuration.Objects</AssemblyName>
<AssemblyName>$(RootNamespace).$(MSBuildProjectName)</AssemblyName>
<LangVersion>latest</LangVersion>
<TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
</PropertyGroup>
Expand All @@ -12,15 +12,26 @@
</PropertyGroup>

<PropertyGroup>
<PackageId>Kralizek.Extensions.Configuration.Objects</PackageId>
<PackageTags>dotnet-standard;microsoft;extensions;configuration;objects;</PackageTags>
<Description>Provider implementation for Microsoft.Extensions.Configuration to support concrete objects.</Description>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<PackageId>$(AssemblyName)</PackageId>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/Kralizek/ObjectConfigurationExtensions</PackageProjectUrl>
<NoWarn>NU5105,NU5125</NoWarn>
<PackageTags>dotnet-standard;microsoft;extensions;configuration;objects;</PackageTags>
<Description>Provider implementation for Microsoft.Extensions.Configuration to support concrete objects.</Description>
</PropertyGroup>

<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
<PackageReference Include="SourceLink.Copy.PdbFiles" Version="2.8.3" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
Expand Down
0 ...nfiguration.Objects/AutoDataAttributes.cs → tests/Tests.Objects/AutoDataAttributes.cs
View file
File renamed without changes.
0 ...nfiguration.Objects/ConfigurationTests.cs → tests/Tests.Objects/ConfigurationTests.cs
View file
File renamed without changes.
0 ...ernal/JsonConfigurationSerializerTests.cs → ...ernal/JsonConfigurationSerializerTests.cs
View file
File renamed without changes.
0 ...ernal/ObjectConfigurationProviderTests.cs → ...ernal/ObjectConfigurationProviderTests.cs
View file
File renamed without changes.
0 ...nternal/ObjectConfigurationSourceTests.cs → ...nternal/ObjectConfigurationSourceTests.cs
View file
File renamed without changes.
0 ...cts/ObjectConfigurationExtensionsTests.cs → ...cts/ObjectConfigurationExtensionsTests.cs
View file
File renamed without changes.
0 ...nsions.Configuration.Objects/TestTypes.cs → tests/Tests.Objects/TestTypes.cs
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...s.Extensions.Configuration.Objects.csproj → tests/Tests.Objects/Tests.Objects.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Kralizek.Extensions.Configuration.Objects\Kralizek.Extensions.Configuration.Objects.csproj" />
<ProjectReference Include="..\..\src\Objects\Objects.csproj" />
</ItemGroup>

</Project>

0 comments on commit 1f5a6fe

Please sign in to comment.