Jelajahi Sumber

workarounds (#485)

* workarounds
* Update .vsts.rx-ci.yml
Oren Novotny 7 tahun lalu
induk
melakukan
29ff6a7cba

+ 10 - 3
.vsts.rx-ci.yml

@@ -7,7 +7,7 @@ queue: Hosted VS2017
 variables: 
 variables: 
   BuildConfiguration: Release
   BuildConfiguration: Release
   BuildPlatform: Any CPU
   BuildPlatform: Any CPU
-    
+
 steps:
 steps:
 - task: BatchScript@1
 - task: BatchScript@1
   inputs:
   inputs:
@@ -15,7 +15,14 @@ steps:
     arguments: -no_logo
     arguments: -no_logo
     modifyEnvironment: true
     modifyEnvironment: true
   displayName: Setup Environment Variables
   displayName: Setup Environment Variables
-    
+
+- task: DotNetCoreCLI@2
+  inputs:
+    command: build
+    projects: Rx.NET/Source/build/serversion.csproj
+    arguments: -c $(BuildConfiguration)   
+  displayName: Set Version
+
 - task: PowerShell@1
 - task: PowerShell@1
   inputs:
   inputs:
     scriptName: 'Rx.NET/Source/build-new.ps1'
     scriptName: 'Rx.NET/Source/build-new.ps1'
@@ -31,4 +38,4 @@ steps:
     PathtoPublish: 'Rx.NET/Source/artifacts'
     PathtoPublish: 'Rx.NET/Source/artifacts'
     ArtifactName: artifacts
     ArtifactName: artifacts
     publishLocation: Container
     publishLocation: Container
-  condition: always()
+  condition: always()

+ 1 - 1
.vsts.rx-pr.yml

@@ -25,4 +25,4 @@ steps:
     PathtoPublish: 'Rx.NET/Source/artifacts'
     PathtoPublish: 'Rx.NET/Source/artifacts'
     ArtifactName: artifacts
     ArtifactName: artifacts
     publishLocation: Container
     publishLocation: Container
-  condition: always()
+  condition: eq(variables['system.pullrequest.isfork'], false)

+ 0 - 27
.vsts.rx.yml

@@ -1,27 +0,0 @@
-queue:
-  name: Hosted VS2017
-  
-steps:
-- task: BatchScript@1
-  inputs:
-    filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
-    arguments: -no_logo
-    modifyEnvironment: true
-  displayName: Setup Environment Variables
-    
-- task: PowerShell@1
-  inputs:
-    scriptName: 'Rx.NET/Source/build-new.ps1'
-    workingFolder: 'Rx.NET/Source'
-  env:
-    VSTS_ACCESS_TOKEN: $(System.AccessToken)
-    SignClientUser: $(SignClientUser)
-    SignClientSecret: $(SignClientSecret)
-  displayName: Build
-
-- task: PublishBuildArtifacts@1
-  inputs:
-    PathtoPublish: 'Rx.NET/Source/artifacts'
-    ArtifactName: artifacts
-    publishLocation: Container
-  condition: always()

+ 7 - 0
Rx.NET/Source/build/setversion.csproj

@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>

+ 8 - 0
Rx.NET/Source/build/version.json

@@ -0,0 +1,8 @@
+{
+  "inherit": true,
+  "cloudBuild": {
+    "buildNumber": {
+      "enabled": true
+    }
+  }
+}

+ 1 - 1
Rx.NET/Source/version.json

@@ -10,7 +10,7 @@
   },
   },
   "cloudBuild": {
   "cloudBuild": {
     "buildNumber": {
     "buildNumber": {
-      "enabled": true
+      "enabled": false
     }
     }
   }
   }
 }
 }