diff --git a/.gitignore b/.gitignore index de1f051..6698fa7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /Properties/launchSettings.json - +## test2 ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. diff --git a/.teamcity/patches/buildTypes/DeployToLocalMachine.kts b/.teamcity/patches/buildTypes/DeployToLocalMachine.kts new file mode 100644 index 0000000..c08c290 --- /dev/null +++ b/.teamcity/patches/buildTypes/DeployToLocalMachine.kts @@ -0,0 +1,37 @@ +package patches.buildTypes + +import jetbrains.buildServer.configs.kotlin.v2018_2.* +import jetbrains.buildServer.configs.kotlin.v2018_2.BuildType +import jetbrains.buildServer.configs.kotlin.v2018_2.buildSteps.powerShell +import jetbrains.buildServer.configs.kotlin.v2018_2.ui.* + +/* +This patch script was generated by TeamCity on settings change in UI. +To apply the patch, create a buildType with id = 'DeployToLocalMachine' +in the root project, and delete the patch script. +*/ +create(DslContext.projectId, BuildType({ + id("DeployToLocalMachine") + name = "deploy to local machine" + + enablePersonalBuilds = false + type = BuildTypeSettings.Type.DEPLOYMENT + maxRunningBuilds = 1 + + steps { + powerShell { + name = "deployment logic" + scriptMode = script { + content = "echo 'Deploy to local machine'" + } + } + } + + dependencies { + snapshot(RelativeId("Build")) { + onDependencyFailure = FailureAction.CANCEL + onDependencyCancel = FailureAction.CANCEL + } + } +})) + diff --git a/.teamcity/patches/buildTypes/DeployToTest.kts b/.teamcity/patches/buildTypes/DeployToTest.kts new file mode 100644 index 0000000..445ef1f --- /dev/null +++ b/.teamcity/patches/buildTypes/DeployToTest.kts @@ -0,0 +1,37 @@ +package patches.buildTypes + +import jetbrains.buildServer.configs.kotlin.v2018_2.* +import jetbrains.buildServer.configs.kotlin.v2018_2.BuildType +import jetbrains.buildServer.configs.kotlin.v2018_2.buildSteps.powerShell +import jetbrains.buildServer.configs.kotlin.v2018_2.ui.* + +/* +This patch script was generated by TeamCity on settings change in UI. +To apply the patch, create a buildType with id = 'DeployToTest' +in the root project, and delete the patch script. +*/ +create(DslContext.projectId, BuildType({ + id("DeployToTest") + name = "deploy to test" + + enablePersonalBuilds = false + type = BuildTypeSettings.Type.DEPLOYMENT + maxRunningBuilds = 1 + + steps { + powerShell { + name = "deployment logic" + scriptMode = script { + content = "echo 'Deploy to Test'" + } + } + } + + dependencies { + snapshot(RelativeId("Build")) { + onDependencyFailure = FailureAction.CANCEL + onDependencyCancel = FailureAction.CANCEL + } + } +})) + diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml new file mode 100644 index 0000000..92a3cf6 --- /dev/null +++ b/.teamcity/pom.xml @@ -0,0 +1,104 @@ + + + 4.0.0 + Hw Config DSL Script + Hw + Hw_dsl + 1.0-SNAPSHOT + + + org.jetbrains.teamcity + configs-dsl-kotlin-parent + 1.0-SNAPSHOT + + + + + jetbrains-all + http://download.jetbrains.com/teamcity-repository + + true + + + + teamcity-server + http://188.242.47.114:17777/app/dsl-plugins-repository + + true + + + + + + + JetBrains + http://download.jetbrains.com/teamcity-repository + + + + + . + + + kotlin-maven-plugin + org.jetbrains.kotlin + ${kotlin.version} + + + + + compile + process-sources + + compile + + + + test-compile + process-test-sources + + test-compile + + + + + + org.jetbrains.teamcity + teamcity-configs-maven-plugin + ${teamcity.dsl.version} + + kotlin + target/generated-configs + + + + + + + + org.jetbrains.teamcity + configs-dsl-kotlin + ${teamcity.dsl.version} + compile + + + org.jetbrains.teamcity + configs-dsl-kotlin-plugins + 1.0-SNAPSHOT + pom + compile + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin.version} + compile + + + org.jetbrains.kotlin + kotlin-script-runtime + ${kotlin.version} + compile + + + \ No newline at end of file diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts new file mode 100644 index 0000000..8d6fff1 --- /dev/null +++ b/.teamcity/settings.kts @@ -0,0 +1,67 @@ +import jetbrains.buildServer.configs.kotlin.v2018_2.* +import jetbrains.buildServer.configs.kotlin.v2018_2.buildSteps.dotnetBuild +import jetbrains.buildServer.configs.kotlin.v2018_2.buildSteps.dotnetRestore +import jetbrains.buildServer.configs.kotlin.v2018_2.triggers.vcs + +/* +The settings script is an entry point for defining a TeamCity +project hierarchy. The script should contain a single call to the +project() function with a Project instance or an init function as +an argument. + +VcsRoots, BuildTypes, Templates, and subprojects can be +registered inside the project using the vcsRoot(), buildType(), +template(), and subProject() methods respectively. + +To debug settings scripts in command-line, run the + + mvnDebug org.jetbrains.teamcity:teamcity-configs-maven-plugin:generate + +command and attach your debugger to the port 8000. + +To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View +-> Tool Windows -> Maven Projects), find the generate task node +(Plugins -> teamcity-configs -> teamcity-configs:generate), the +'Debug' option is available in the context menu for the task. +*/ + +version = "2018.2" + +project { + + buildType(Build) +} + +object Build : BuildType({ + name = "Build" + + allowExternalStatus = true + + vcs { + root(DslContext.settingsRoot) + } + + steps { + dotnetRestore { + name = "nuget restore" + projects = "ElectronNetAngular.sln" + param("dotNetCoverage.dotCover.home.path", "%teamcity.tool.JetBrains.dotCover.CommandLineTools.DEFAULT%") + } + step { + name = "npm ci" + type = "jonnyzzz.npm" + param("teamcity.build.workingDir", "ElectronNetAngular") + param("npm_commands", "ci") + } + dotnetBuild { + name = "dotnet build" + projects = "ElectronNetAngular.sln" + param("dotNetCoverage.dotCover.home.path", "%teamcity.tool.JetBrains.dotCover.CommandLineTools.DEFAULT%") + } + } + + triggers { + vcs { + } + } +}) diff --git a/ElectronNetAngular/ElectronNetAngular.csproj b/ElectronNetAngular/ElectronNetAngular.csproj index 01ca42b..4cc5292 100644 --- a/ElectronNetAngular/ElectronNetAngular.csproj +++ b/ElectronNetAngular/ElectronNetAngular.csproj @@ -10,9 +10,9 @@ - + diff --git a/README.md b/README.md new file mode 100644 index 0000000..968d38f --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# hw + +![TeamCity build](http://188.242.47.114:17777/app/rest/builds/buildType:(id:Hw_Build)/statusIcon.svg)