finish pipeline edits

2022-04-20 10:32:39 -05:00 · 2022-04-20 10:32:39 -05:00 · 5e12bf60b5
commit 5e12bf60b5
parent 2f10ca8599
2 changed files with 67 additions and 67 deletions
--- a/DeploymentFiles/deployment-pipeline.yml
+++ b/DeploymentFiles/deployment-pipeline.yml
@ -171,72 +171,72 @@ steps:
    targetPath: '$(Build.ArtifactStagingDirectory)/IW4MAdmin-$(Build.BuildNumber).zip'
    artifact: 'IW4MAdmin-$(Build.BuildNumber).zip'

-#- task: FtpUpload@2
-#  displayName: 'Upload zip file to website'
-#  inputs:
-#    credentialsOption: 'inputs'
-#    serverUrl: '$(FTPUrl)'
-#    username: '$(FTPUsername)'
-#    password: '$(FTPPassword)'
-#    rootDirectory: '$(Build.ArtifactStagingDirectory)'
-#    filePatterns: '*.zip'
-#    remoteDirectory: 'IW4MAdmin/Download'
-#    clean: false
-#    cleanContents: false
-#    preservePaths: false
-#    trustSSL: false
-#
-#- task: FtpUpload@2
-#  displayName: 'Upload version info to website'
-#  inputs:
-#    credentialsOption: 'inputs'
-#    serverUrl: '$(FTPUrl)'
-#    username: '$(FTPUsername)'
-#    password: '$(FTPPassword)'
-#    rootDirectory: '$(Build.ArtifactStagingDirectory)'
-#    filePatterns: 'version_$(releaseType).txt'
-#    remoteDirectory: 'IW4MAdmin'
-#    clean: false
-#    cleanContents: false
-#    preservePaths: false
-#    trustSSL: false
-#
-#- task: GitHubRelease@1
-#  displayName: 'Make GitHub release'
-#  inputs:
-#    gitHubConnection: 'github.com_RaidMax'
-#    repositoryName: 'RaidMax/IW4M-Admin'
-#    action: 'create'
-#    target: '$(Build.SourceVersion)'
-#    tagSource: 'userSpecifiedTag'
-#    tag: '$(Build.BuildNumber)-$(releaseType)'
-#    title: 'IW4MAdmin $(Build.BuildNumber) ($(releaseType))'
-#    assets: '$(Build.ArtifactStagingDirectory)/*.zip'
-#    isPreRelease: $(isPreRelease)
-#    releaseNotesSource: 'inline'
-#    releaseNotesInline: 'todo'
-#    changeLogCompareToRelease: 'lastNonDraftRelease'
-#    changeLogType: 'commitBased'
-#
-#- task: PowerShell@2
-#  displayName: 'Update master version'
-#  inputs:
-#    targetType: 'inline'
-#    script: |
-#      $payload = @{
-#          'current-version-$(releaseType)' = '$(Build.BuildNumber)'
-#          'jwt-secret' = '$(JWTSecret)'
-#      } | ConvertTo-Json
-#              
-#      
-#      $params = @{
-#          Uri         = 'http://api.raidmax.org:5000/version'
-#          Method      = 'POST'
-#          Body        = $payload
-#          ContentType = 'application/json'
-#      }
-#      
-#      Invoke-RestMethod @params
+- task: FtpUpload@2
+  displayName: 'Upload zip file to website'
+  inputs:
+    credentialsOption: 'inputs'
+    serverUrl: '$(FTPUrl)'
+    username: '$(FTPUsername)'
+    password: '$(FTPPassword)'
+    rootDirectory: '$(Build.ArtifactStagingDirectory)'
+    filePatterns: '*.zip'
+    remoteDirectory: 'IW4MAdmin/Download'
+    clean: false
+    cleanContents: false
+    preservePaths: false
+    trustSSL: false
+
+- task: FtpUpload@2
+  displayName: 'Upload version info to website'
+  inputs:
+    credentialsOption: 'inputs'
+    serverUrl: '$(FTPUrl)'
+    username: '$(FTPUsername)'
+    password: '$(FTPPassword)'
+    rootDirectory: '$(Build.ArtifactStagingDirectory)'
+    filePatterns: 'version_$(releaseType).txt'
+    remoteDirectory: 'IW4MAdmin'
+    clean: false
+    cleanContents: false
+    preservePaths: false
+    trustSSL: false
+
+- task: GitHubRelease@1
+  displayName: 'Make GitHub release'
+  inputs:
+    gitHubConnection: 'github.com_RaidMax'
+    repositoryName: 'RaidMax/IW4M-Admin'
+    action: 'create'
+    target: '$(Build.SourceVersion)'
+    tagSource: 'userSpecifiedTag'
+    tag: '$(Build.BuildNumber)-$(releaseType)'
+    title: 'IW4MAdmin $(Build.BuildNumber) ($(releaseType))'
+    assets: '$(Build.ArtifactStagingDirectory)/*.zip'
+    isPreRelease: $(isPreRelease)
+    releaseNotesSource: 'inline'
+    releaseNotesInline: 'todo'
+    changeLogCompareToRelease: 'lastNonDraftRelease'
+    changeLogType: 'commitBased'
+
+- task: PowerShell@2
+  displayName: 'Update master version'
+  inputs:
+    targetType: 'inline'
+    script: |
+      $payload = @{
+          'current-version-$(releaseType)' = '$(Build.BuildNumber)'
+          'jwt-secret' = '$(JWTSecret)'
+      } | ConvertTo-Json
+              
+      
+      $params = @{
+          Uri         = 'http://api.raidmax.org:5000/version'
+          Method      = 'POST'
+          Body        = $payload
+          ContentType = 'application/json'
+      }
+      
+      Invoke-RestMethod @params

 - task: PublishPipelineArtifact@1
  displayName: 'Publish artifact for analysis'
--- a/WebfrontCore/WebfrontCore.csproj
+++ b/WebfrontCore/WebfrontCore.csproj
@ -78,6 +78,6 @@
  </ProjectExtensions>

  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <Exec Command="if $(ConfigurationName) == Debug ( &#xA;powershell -Command wget https://raw.githubusercontent.com/iconic/open-iconic/master/font/css/open-iconic-bootstrap.scss -o $(ProjectDir)wwwroot\lib\open-iconic\font\css\open-iconic-bootstrap.scss&#xA;echo d | xcopy /f /y $(ProjectDir)wwwroot\lib\open-iconic\font\fonts $(ProjectDir)wwwroot\font\&#xA;powershell -Command &quot;((Get-Content -path  $(ProjectDir)wwwroot\lib\open-iconic\font\css\open-iconic-bootstrap.scss -Raw) -replace '../fonts/','/fonts/') | Set-Content -Path $(ProjectDir)wwwroot\lib\open-iconic\font\css\open-iconic-bootstrap.scss&quot;&#xA;)" />
+    <Exec Command="if $(ConfigurationName) == Debug ( &#xA;powershell -Command wget https://raw.githubusercontent.com/iconic/open-iconic/master/font/css/open-iconic-bootstrap.scss -o $(ProjectDir)wwwroot\lib\open-iconic\font\css\open-iconic-bootstrap-override.scss&#xA;echo d | xcopy /f /y $(ProjectDir)wwwroot\lib\open-iconic\font\fonts $(ProjectDir)wwwroot\font\&#xA;powershell -Command &quot;((Get-Content -path  $(ProjectDir)wwwroot\lib\open-iconic\font\css\open-iconic-bootstrap-override.scss -Raw) -replace '../fonts/','/fonts/') | Set-Content -Path $(ProjectDir)wwwroot\lib\open-iconic\font\css\open-iconic-bootstrap-override.scss&quot;&#xA;)" />
  </Target>
 </Project>