Merge branch 'main' into project-ui-scaffold

haroohie-club · Jan 31, 2023 · 4464f16 · 4464f16
2 parents 9230bae + 869fb2c
commit 4464f16
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 6 deletions.
diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
@@ -0,0 +1,37 @@
+trigger:
+- main
+- release/*
+pr:
+- none
+
+jobs:
+- job:
+  strategy:
+    matrix:
+      Linux:
+        imageName: 'ubuntu-latest'
+      macOS:
+        imageName: 'macOS-latest'
+      Windows:
+        imageName: 'windows-latest'
+  displayName: Build & Publish
+  pool:
+    vmImage: $(imageName)
+  steps:
+  - checkout: self
+    clean: true
+
+  - task: DotNetCoreCLI@2
+    inputs:
+      command: 'publish'
+      projects: $(Build.SourcesDirectory)/src/SerialLoops/SerialLoops.csproj
+      arguments: '-c Release -o $(Build.ArtifactStagingDirectory)'
+      publishWebProjects: false
+    displayName: Build & Publish Serial Loops
+
+  - task: PublishBuildArtifacts@1
+    inputs:
+      PathtoPublish: '$(Build.ArtifactStagingDirectory)'
+      ArtifactName: '$(imageName)'
+      publishLocation: 'Container'
+    displayName: Publish build artifacts
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,15 +1,17 @@
+trigger:
+- none
 pr:
 - main
 
 jobs:
 - job:
   strategy:
     matrix:
-      linux:
+      Linux:
         imageName: 'ubuntu-latest'
-      mac:
+      macOS:
         imageName: 'macOS-latest'
-      windows:
+      Windows:
         imageName: 'windows-latest'
   displayName: Build & Test
   pool:
@@ -21,12 +23,12 @@ jobs:
   - task: DotNetCoreCLI@2
     inputs:
       command: 'build'
-      projects: SerialLoops.sln
+      projects: $(Build.SourcesDirectory)/SerialLoops.sln
     displayName: Build solution
 
   - task: DotNetCoreCLI@2
     inputs:
       comand: 'test'
-      projects: test/SerialLoops.Tests/SerialLoops.Tests.csproj
+      projects: $(Build.SourcesDirectory)/test/SerialLoops.Tests/SerialLoops.Tests.csproj
       publishTestResults: true
 
diff --git a/src/SerialLoops.Lib/SerialLoops.Lib.csproj b/src/SerialLoops.Lib/SerialLoops.Lib.csproj
@@ -6,4 +6,9 @@
     <Nullable>disable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="HaruhiChokuretsuLib" Version="0.10.0" />
+    <PackageReference Include="NitroPacker.Core" Version="2.0.0" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/SerialLoops/SerialLoops.csproj b/src/SerialLoops/SerialLoops.csproj
@@ -13,7 +13,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HaruhiChokuretsuLib" Version="0.10.0" />
     <PackageReference Include="System.Text.Json" Version="7.0.1" />
   </ItemGroup>