Users/ngbu/xamldirect

.ado/publish.yml

@@ -37,17 +37,11 @@ jobs:
 
       - task: CmdLine@2
         displayName: Update package version
+        name: updateVersionTask
         inputs:
           script: node ../.ado/updateVersion.js
           workingDirectory: vnext
 
-      # since the above task will update the package.json, we want to ensure that we use the correct version for the nuget
-      - task: PublishBuildArtifacts@1
-        displayName: 'Publish updated package.json for nuget'
-        inputs:
-          PathtoPublish: 'vnext\package.json'
-          ArtifactName: 'UpdatedPackageJson'
-
       - task: Npm@1
         displayName: npm public publish (vnext)
         inputs:
@@ -61,6 +55,8 @@ jobs:
   - job: RnwNativeBuild
     displayName: React-Native-Windows Native Build
     dependsOn: RnwNpmPublish
+    variables:
+      publishCommitId: $[ dependencies.RnwNpmPublish.outputs['updateVersionTask.publishCommitId'] ]
     strategy:
       matrix:
         X64Debug:
@@ -90,13 +86,11 @@ jobs:
 
     steps:
 
-      # The RnwNpmPublish task does this too before publishing the npm package,
-      # but when each slice checks out code, its not going to have those changes
+      # Sync to point where the version numbers have been updated
     - task: CmdLine@2
-      displayName: Update version numbers to align with publishing version
       inputs:
-        script: node ../.ado/bumpFileVersions.js
-        workingDirectory: vnext
+        script: git checkout $(publishCommitId)
+
 
     - template: templates/npm-install-and-build.yml
 
@@ -115,20 +109,28 @@ jobs:
 
 
   - job: RNWNuget
-    dependsOn: RnwNativeBuild
+    dependsOn:
+      - RnwNpmPublish
+      - RnwNativeBuild
     displayName: React-Native-Windows Build and Publish Nuget
     pool:
       name: OE Standard Pool
+    variables:
+      publishCommitId: $[ dependencies.RnwNpmPublish.outputs['updateVersionTask.publishCommitId'] ]
+      npmVersion: $[ dependencies.RnwNpmPublish.outputs['updateVersionTask.npmVersion'] ]
+
     steps:
       - checkout: none #skip checking out the default repository resource
 
-      - task: DownloadBuildArtifacts@0
-        displayName: 'Download source Artifact'
+      # The commit tag in the nuspec requires that we use at least nuget 4.6
+      - task: NuGetToolInstaller@0
         inputs:
-          artifactName: UpdatedPackageJson
-          downloadPath: $(System.DefaultWorkingDirectory)
+          versionSpec: '>=4.6.0' 
 
       - template: templates/prep-and-pack-nuget.yml
+        parameters:
+          publishCommitId: $(publishCommitId)
+          npmVersion: $(npmVersion)
 
       - task: NuGetCommand@2
         displayName: 'NuGet push'

.ado/templates/prep-and-pack-nuget.yml

@@ -1,3 +1,6 @@
+parameters:
+  publishCommitId: '0'
+  npmVersion: '0.0.1-pr'
 
 steps:
   - task: DownloadBuildArtifacts@0
@@ -50,23 +53,10 @@ steps:
         robocopy $(System.DefaultWorkingDirectory)\ReactWindows-debug-arm $(System.DefaultWorkingDirectory)\NugetRoot\target\arm\debug /E /MOVE /NP
         robocopy $(System.DefaultWorkingDirectory)\ReactWindows-ship-arm $(System.DefaultWorkingDirectory)\NugetRoot\target\arm\ship /E /MOVE /NP
 
-  - task: PowerShell@2
-    displayName: Extract version from package.json, and put it in nuspec
-    inputs:
-      targetType: inline # filePath | inline
-      script: |
-        if (Test-Path $env:SYSTEM_DEFAULTWORKINGDIRECTORY/UpdatedPackageJson/package.json) {
-          $lines = Get-Content $env:SYSTEM_DEFAULTWORKINGDIRECTORY/UpdatedPackageJson/package.json | Where {$_ -match '^\s*"version":.*'} 
-          $npmVersion = $lines.Trim().Split()[1].Trim('",');
-        } else {
-          $npmVersion = "0.0.1-pr"
-        }
-        (Get-Content $env:SYSTEM_DEFAULTWORKINGDIRECTORY/NugetRoot/ReactWin32.nuspec).replace('__BuildBuildNumber__', $npmVersion) | Set-Content $env:SYSTEM_DEFAULTWORKINGDIRECTORY/NugetRoot/ReactWin32.nuspec
-        (Get-Content $env:SYSTEM_DEFAULTWORKINGDIRECTORY/NugetRoot/ReactUwp.nuspec).replace('__BuildBuildNumber__', $npmVersion) | Set-Content $env:SYSTEM_DEFAULTWORKINGDIRECTORY/NugetRoot/ReactUwp.nuspec
-
   - task: NuGetCommand@2
     displayName: 'NuGet pack'
     inputs:
       command: pack
       packagesToPack: '$(System.DefaultWorkingDirectory)/NugetRoot/React*.nuspec'
-      packDestination: '$(System.DefaultWorkingDirectory)/NugetRoot/'
+      packDestination: '$(System.DefaultWorkingDirectory)/NugetRoot/'
+      buildProperties: CommitId=${{parameters.publishCommitId}};npmVersion=${{parameters.npmVersion}}

.ado/templates/vs-build.yml

@@ -14,7 +14,7 @@ steps:
       feedsToUse: config
       #vstsFeed: # Required when feedsToUse == Select
       #includeNuGetOrg: true # Required when feedsToUse == Select
-      nugetConfigPath: vnext/NuGet.config
+      nugetConfigPath: vnext/NuGet.config 
       #externalFeedCredentials: # Optional
       #noCache: false
       #disableParallelProcessing: false

.ado/updateVersion.js

@@ -65,6 +65,11 @@ function updateVersion() {
   exec(`git push origin HEAD:${tempPublishBranch} --follow-tags --verbose`);
   exec(`git push origin tag ${tagName}`);
 
+  // Record the updated npmVersion and commitId so that later build tasks can use it (to record in the nuget for instance)
+  const publishCommitId = execSync(`git rev-list -n 1 ${tagName}`);
+  console.log(`##vso[task.setvariable variable=publishCommitId;isOutput=true]${publishCommitId}`);
+  console.log(`##vso[task.setvariable variable=npmVersion;isOutput=true]${releaseVersion}`);
+
   exec(`git checkout ${publishBranchName}`);
   exec(`git pull origin ${publishBranchName}`);
   exec(`git merge ${tempPublishBranch} --no-edit`);

.ado/windows-vs-pr.yml

@@ -132,6 +132,90 @@ jobs:
           script: del SampleApp.uwp.bundle
           workingDirectory: vnext
 
+  - job: CliInit
+    displayName: Verify react-native init
+    pool:
+      vmImage: vs2017-win2016
+    timeoutInMinutes: 60 # how long to run the job before automatically cancelling
+    cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
+    steps:
+      - checkout: self # self represents the repo where the initial Pipelines YAML file was found
+        clean: true # whether to fetch clean each time
+        # fetchDepth: 2 # the depth of commits to ask Git to fetch
+        lfs: false # whether to download Git-LFS files
+        submodules: false # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
+        persistCredentials: false # set to 'true' to leave the OAuth token in the Git config after the initial fetch
+
+      # First do a build of the local package, since we point the cli at the local files, it needs to be pre-built
+      - task: CmdLine@2
+        displayName: yarn install (local react-native-windows)
+        inputs:
+          script: yarn install --frozen-lockfile
+          workingDirectory: vnext
+
+      - task: CmdLine@2
+        displayName: yarn build (local react-native-windows)
+        inputs:
+          script: yarn build
+          workingDirectory: vnext
+
+      # yarn ends up copying the whole node_modules folder when doing an install of a file package
+      # Delete node_modules, so that resolution is more like when installing from a published npm package
+      - task: CmdLine@2
+        displayName: Remove node_modules
+        inputs:
+          script: rd /S /Q node_modules
+          workingDirectory: vnext
+
+      - task: CmdLine@2
+        displayName: Install react-native cli
+        inputs:
+          script: npm install -g react-native-cli
+
+      - task: CmdLine@2
+        displayName: Init new project
+        inputs:
+          script: react-native init testcli
+          workingDirectory: $(Agent.BuildDirectory)
+
+      - task: CmdLine@2
+        displayName: Install rnpm-plugin-windows
+        inputs:
+          script: yarn add rnpm-plugin-windows@file:$(Build.SourcesDirectory)\current\local-cli\rnpm\windows
+          workingDirectory: $(Agent.BuildDirectory)\testcli
+
+      - task: CmdLine@2
+        displayName: Apply windows template
+        inputs:
+          script: react-native windows --template vnext --windowsVersion file:$(Build.SourcesDirectory)\vnext
+          workingDirectory: $(Agent.BuildDirectory)\testcli
+
+      - template: templates/install-SDK.yml
+
+      - task: NuGetCommand@2
+        displayName: NuGet restore
+        inputs:
+          command: restore
+          restoreSolution: $(Agent.BuildDirectory)\testcli\windows\testcli.sln
+
+      - task: MSBuild@1
+        displayName: MSBuild - Build the project
+        inputs:
+          solution: $(Agent.BuildDirectory)\testcli\windows\testcli.sln
+          msbuildVersion: '15.0' # Optional. Options: latest, 16.0, 15.0, 14.0, 12.0, 4.0
+          msbuildArchitecture: 'x86' # Optional. Options: x86, x64
+          platform: x64 # Optional
+          configuration: Debug # Optional
+          restoreNugetPackages: true
+          msbuildArguments: '/p:PreferredToolArchitecture=x64' # Optional
+          clean: true # Optional
+
+      - task: CmdLine@2
+        displayName: Create bundle
+        inputs:
+          script: react-native bundle --entry-file App.windows.js platform uwp --bundle-output test.bundle
+          workingDirectory: $(Agent.BuildDirectory)\testcli
+
   - job: RnwNativePRBuild
     displayName: Windows Visual Studio with Win32 PR
     strategy:
@@ -296,4 +380,9 @@ jobs:
     steps:
       - checkout: none #skip checking out the default repository resource
 
+      # The commit tag in the nuspec requires that we use at least nuget 4.6
+      - task: NuGetToolInstaller@0
+        inputs:
+          versionSpec: '>=4.6.0' 
+
       - template: templates/prep-and-pack-nuget.yml

vnext/.editorconfig

@@ -14,10 +14,13 @@ indent_size = 2
 end_of_line = crlf
 
 # Xml project files
-[*.{csproj,vcxproj,pssproj,vcxproj.filters,targets,props}]
+[*.{config,csproj,props,targets,vcxitems,vcxproj,vcxproj.filters}]
 end_of_line = crlf
 insert_final_newline = false
 
 [*.ps1]
 indent_style = tab
 indent_size = 4
+
+[package.json]
+insert_final_newline = false