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

Add presentation library #10

Merged
merged 16 commits into from
Jan 24, 2020
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
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@
/BSN.Commons/packages
/BSN.Commons/BSN.Commons/bin
/BSN.Commons/BSN.Commons/obj
/BSN.Commons/BSN.Commons.PresentationInfrastructure/bin
/BSN.Commons/BSN.Commons.PresentationInfrastructure/obj
Source/BSN.Commons/bin
Source/BSN.Commons/obj
Source/BSN.Commons.PresentationInfrastructure/bin
Source/BSN.Commons.PresentationInfrastructure/obj
*.lock
*.dtbcache
/.vs/
Expand All @@ -21,3 +25,6 @@ Test/BSN.Commons.Tests/bin
Test/BSN.Commons.Tests/obj
/Test/BSN.Commons.Tests/bin
/Test/BSN.Commons.Tests/obj
Source/BSN.Commons.PresentationInfrastructure/obj/BSN.Commons.PresentationInfrastructure.csproj.nuget.cache
Source/BSN.Commons.PresentationInfrastructure/obj/BSN.Commons.PresentationInfrastructure.csproj.nuget.dgspec.json
Source/BSN.Commons.PresentationInfrastructure/obj/project.assets.json
Binary file modified .vs/BSN.Commons/DesignTimeBuild/.dtbcache
Binary file not shown.
1 change: 1 addition & 0 deletions .vs/VSWorkspaceState.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
"\\Source",
"\\Source\\BSN.Commons"
],
"SelectedNode": "\\Source\\BSN.Commons\\BSN.Commons.csproj",
"PreviewInSolutionExplorer": false
}
Binary file modified .vs/slnx.sqlite
Binary file not shown.
15 changes: 15 additions & 0 deletions BSN.Commons.sln
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BSN.Commons", "Source\BSN.C
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BSN.Commons.Tests", "Test\BSN.Commons.Tests\BSN.Commons.Tests.csproj", "{128FAA47-21B1-4FBE-AC24-E33C6AE218CA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BSN.Commons.PresentationInfrastructure", "Source\BSN.Commons.PresentationInfrastructure\BSN.Commons.PresentationInfrastructure.csproj", "{BFA36BA8-621F-490D-AB4E-ECEFB639CAC4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{320ED66B-71A0-473E-AC25-A464A9485EEE}"
ProjectSection(SolutionItems) = preProject
appveyor.yml = appveyor.yml
GitVersion.yml = GitVersion.yml
LICENSE = LICENSE
README.md = README.md
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -33,13 +43,18 @@ Global
{128FAA47-21B1-4FBE-AC24-E33C6AE218CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{128FAA47-21B1-4FBE-AC24-E33C6AE218CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{128FAA47-21B1-4FBE-AC24-E33C6AE218CA}.Release|Any CPU.Build.0 = Release|Any CPU
{BFA36BA8-621F-490D-AB4E-ECEFB639CAC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BFA36BA8-621F-490D-AB4E-ECEFB639CAC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BFA36BA8-621F-490D-AB4E-ECEFB639CAC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BFA36BA8-621F-490D-AB4E-ECEFB639CAC4}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{FFEF752B-4E11-44FF-82FA-9AEC0B607990} = {DC377ADC-CC9D-4785-81BE-726DBF5F3096}
{128FAA47-21B1-4FBE-AC24-E33C6AE218CA} = {5C6BA7B5-832A-495A-AF5E-C2A74F6A1EF9}
{BFA36BA8-621F-490D-AB4E-ECEFB639CAC4} = {DC377ADC-CC9D-4785-81BE-726DBF5F3096}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {BCAF76D3-AA3C-4D0F-8D10-34065F8FED09}
Expand Down
63 changes: 40 additions & 23 deletions Build/build.cake
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#tool "nuget:?package=coveralls.io&version=1.4.2"
#tool "nuget:?package=GitVersion.CommandLine"
#tool "nuget:?package=gitlink"
#tool "nuget:?package=GitReleaseNotes"
#tool "nuget:?package=GitVersion.CommandLine&version=5.1.3"
#tool "nuget:?package=gitlink&version=3.1.0"
#tool "nuget:?package=GitReleaseNotes&version=0.7.1"

#addin "nuget:?package=Cake.Git&version=0.21.0"
#addin "nuget:?package=Nuget.Core"
//#addin "nuget:?package=Cake.Git&version=0.21.0"
#addin "nuget:?package=Nuget.Core&version=2.14.0"
#addin "nuget:?package=Cake.Coveralls&version=0.10.1"
#addin "nuget:?package=Cake.Coverlet&version=2.3.4"

Expand All @@ -14,12 +14,13 @@ var target = Argument("target", "Default");
var artifactsDir = "./artifacts/";
var solutionPath = "../BSN.Commons.sln";
var projectName = "BSN.Commons";
var project = "../Source/BSN.Commons/BSN.Commons.csproj";
var mainProject = "../Source/BSN.Commons/BSN.Commons.csproj";
var presentationProject = "../Source/BSN.Commons.PresentationInfrastructure/BSN.Commons.PresentationInfrastructure.csproj";
var testFolder = "../Test/BSN.Commons.Tests/";
var testProject = testFolder + "BSN.Commons.Tests.csproj";
var coverageResultsFileName = "coverage.xml";
var currentBranch = Argument<string>("currentBranch", GitBranchCurrent("../").FriendlyName);
var isReleaseBuild = string.Equals(currentBranch, "master", StringComparison.OrdinalIgnoreCase);
//var currentBranch = Argument<string>("currentBranch", GitBranchCurrent("../").FriendlyName);
var isReleaseBuild = false;//string.Equals(currentBranch, "master", StringComparison.OrdinalIgnoreCase);
var configuration = "Release";
var nugetApiKey = Argument<string>("nugetApiKey", null);
var coverallsToken = Argument<string>("coverallsToken", null);
Expand All @@ -46,13 +47,14 @@ Task("Clean")

Task("Restore")
.Does(() => {
DotNetCoreRestore(solutionPath);
NuGetRestore(solutionPath);
});

GitVersion versionInfo = null;
//GitVersion versionInfo = null;
Task("Version")
.Does(() => {

/*
GitVersion(new GitVersionSettings{
UpdateAssemblyInfo = true,
OutputType = GitVersionOutput.BuildServer
Expand All @@ -62,22 +64,15 @@ Task("Version")
OutputType = GitVersionOutput.Json
});

// Update project.json
string pureVersion = XmlPeek(project, "//Version");
string assemblyVersion = XmlPeek(project, "//AssemblyVersion");
string fileVersion = XmlPeek(project, "//FileVersion");

var updatedProjectJson = System.IO.File.ReadAllText(project)
.Replace(pureVersion, versionInfo.NuGetVersion)
.Replace(fileVersion, versionInfo.NuGetVersion)
.Replace(assemblyVersion, versionInfo.NuGetVersion);
UpdateVersion(mainProject);
UpdateVersion(presentationProject);
*/

System.IO.File.WriteAllText(project, updatedProjectJson);
});

Task("Build")
.IsDependentOn("Clean")
.IsDependentOn("Restore")
.IsDependentOn("Clean")
.Does(() => {
DotNetCoreBuild(
solutionPath,
Expand All @@ -103,7 +98,7 @@ Task("Test")
};

DotNetCoreTest(testProject, settings, coverletSettings);
//MoveFile("./" + coverageResultsFileName, artifactsDir + coverageResultsFileName);
MoveFile("./coverage-test/" + coverageResultsFileName, artifactsDir + coverageResultsFileName);
});

Task("UploadCoverage")
Expand All @@ -128,7 +123,8 @@ Task("Package")

//GenerateReleaseNotes();

DotNetCorePack(project, settings);
DotNetCorePack(mainProject, settings);
DotNetCorePack(presentationProject, settings);
/*
System.IO.File.WriteAllLines(artifactsDir, new[]{
"nuget:" + projectName + "." + versionInfo.NuGetVersion + ".nupkg",
Expand Down Expand Up @@ -182,6 +178,7 @@ private bool IsNuGetPublished(FilePath packagePath) {
return latestPublishedVersions.Any(p => package.Version.Equals(new SemanticVersion(p.Version)));
}

/*
private void GenerateReleaseNotes()
{
GitReleaseNotes(artifactsDir + "/releasenotes.md", new GitReleaseNotesSettings {
Expand All @@ -199,6 +196,26 @@ private void GenerateReleaseNotes()
if (string.IsNullOrEmpty(System.IO.File.ReadAllText("./artifacts/releasenotes.md")))
System.IO.File.WriteAllText("./artifacts/releasenotes.md", "No issues closed since last release");
}
*/
/*
private void UpdateVersion(string projectPath)
{
Information("UpdateVersion .................................................");
Information(projectPath);
// Update projectPath.json
string pureVersion = XmlPeek(projectPath, "//Version");
Information(pureVersion);
string assemblyVersion = XmlPeek(projectPath, "//AssemblyVersion");
string fileVersion = XmlPeek(projectPath, "//FileVersion");

var updatedProjectJson = System.IO.File.ReadAllText(projectPath)
.Replace(pureVersion, versionInfo.NuGetVersion)
.Replace(fileVersion, versionInfo.NuGetVersion)
.Replace(assemblyVersion, versionInfo.NuGetVersion);

System.IO.File.WriteAllText(projectPath, updatedProjectJson);
}
*/

Task("BuildAndTest")
.IsDependentOn("Build")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Description>Presentation infrastructure layer of Commons library for enterprise application.</Description>
<AssemblyVersion>1.6.2</AssemblyVersion>
<FileVersion>1.6.2</FileVersion>
<Version>1.6.2</Version>
<Authors>BSN Developers</Authors>
<Company>BSN Company</Company>
<Copyright>BSN Co 2019</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryUrl>https://github.com/BSVN/Commons.git</RepositoryUrl>
<PackageProjectUrl>https://github.com/BSVN/Commons</PackageProjectUrl>
<RepositoryType>git</RepositoryType>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"runtimeTarget": {
"name": ".NETStandard,Version=v2.0/",
"signature": ""
},
"compilationOptions": {},
"targets": {
".NETStandard,Version=v2.0": {},
".NETStandard,Version=v2.0/": {
"BSN.Commons.PresentationInfrastructure/1.6.2": {
"dependencies": {
"NETStandard.Library": "2.0.3",
"System.ComponentModel.Annotations": "4.7.0"
},
"runtime": {
"BSN.Commons.PresentationInfrastructure.dll": {}
}
},
"Microsoft.NETCore.Platforms/1.1.0": {},
"NETStandard.Library/2.0.3": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0"
}
},
"System.ComponentModel.Annotations/4.7.0": {
"runtime": {
"lib/netstandard2.0/System.ComponentModel.Annotations.dll": {
"assemblyVersion": "4.2.1.0",
"fileVersion": "4.6.26515.6"
}
}
}
}
},
"libraries": {
"BSN.Commons.PresentationInfrastructure/1.6.2": {
"type": "project",
"serviceable": false,
"sha512": ""
},
"Microsoft.NETCore.Platforms/1.1.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==",
"path": "microsoft.netcore.platforms/1.1.0",
"hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512"
},
"NETStandard.Library/2.0.3": {
"type": "package",
"serviceable": true,
"sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
"path": "netstandard.library/2.0.3",
"hashPath": "netstandard.library.2.0.3.nupkg.sha512"
},
"System.ComponentModel.Annotations/4.7.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-0YFqjhp/mYkDGpU0Ye1GjE53HMp9UVfGN7seGpAMttAC0C40v5gw598jCgpbBLMmCo0E5YRLBv5Z2doypO49ZQ==",
"path": "system.componentmodel.annotations/4.7.0",
"hashPath": "system.componentmodel.annotations.4.7.0.nupkg.sha512"
}
}
}
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"version": 1,
"dgSpecHash": "Nih0LWzpJhtkgwzqDPPP5qBMp8QE6iVU3trY9g6cIVReO+GVT1UK8lCGYyMIvNPv9ZlRBdkhxqzUzqZ07+mXuA==",
"success": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"format": 1,
"restore": {
"C:\\Users\\sooro\\Documents\\Visual Studio 2019\\Projects\\soroshsabz\\Commons\\Source\\BSN.Commons.PresentationInfrastructure\\BSN.Commons.PresentationInfrastructure.csproj": {}
},
"projects": {
"C:\\Users\\sooro\\Documents\\Visual Studio 2019\\Projects\\soroshsabz\\Commons\\Source\\BSN.Commons.PresentationInfrastructure\\BSN.Commons.PresentationInfrastructure.csproj": {
"version": "1.6.2",
"restore": {
"projectUniqueName": "C:\\Users\\sooro\\Documents\\Visual Studio 2019\\Projects\\soroshsabz\\Commons\\Source\\BSN.Commons.PresentationInfrastructure\\BSN.Commons.PresentationInfrastructure.csproj",
"projectName": "BSN.Commons.PresentationInfrastructure",
"projectPath": "C:\\Users\\sooro\\Documents\\Visual Studio 2019\\Projects\\soroshsabz\\Commons\\Source\\BSN.Commons.PresentationInfrastructure\\BSN.Commons.PresentationInfrastructure.csproj",
"packagesPath": "C:\\Users\\sooro\\.nuget\\packages\\",
"outputPath": "C:\\Users\\sooro\\Documents\\Visual Studio 2019\\Projects\\soroshsabz\\Commons\\Source\\BSN.Commons.PresentationInfrastructure\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
"C:\\Microsoft\\Xamarin\\NuGet\\",
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
"C:\\Users\\sooro\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
],
"originalTargetFrameworks": [
"netstandard2.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netstandard2.0": {
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"netstandard2.0": {
"dependencies": {
"NETStandard.Library": {
"suppressParent": "All",
"target": "Package",
"version": "[2.0.3, )",
"autoReferenced": true
},
"System.ComponentModel.Annotations": {
"target": "Package",
"version": "[4.7.0, )"
}
},
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48"
],
"assetTargetFallback": true,
"warn": true,
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.101\\RuntimeIdentifierGraph.json"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\sooro\.nuget\packages\;C:\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.4.0</NuGetToolVersion>
</PropertyGroup>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="$(NuGetPackageRoot)netstandard.library\2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('$(NuGetPackageRoot)netstandard.library\2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
</ImportGroup>
</Project>
Loading