From 4163325e406a92e7e2700bcd62f7acdb9b6f86ec Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 28 Oct 2019 14:41:14 -0700 Subject: [PATCH 01/17] Replace Build.ArtifactStagingDirectory with Build.StagingDirectory. They are equivalent as stated in Azure DevOps documentation. --- .ado/publish.yml | 16 ++++++++-------- .../publish-build-artifacts-for-nuget.yml | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.ado/publish.yml b/.ado/publish.yml index dbfbd47df5d..688d8103ea3 100644 --- a/.ado/publish.yml +++ b/.ado/publish.yml @@ -59,12 +59,12 @@ jobs: inputs: script: node ./.ado/setVersionEnvVars.js env: - RUNNER_TEMP: $(Build.ArtifactStagingDirectory) + RUNNER_TEMP: $(Build.StagingDirectory) - task: PublishBuildArtifacts@1 displayName: Publish VersionEnvVars inputs: - PathtoPublish: $(Build.ArtifactStagingDirectory)/versionEnvVars + PathtoPublish: $(Build.StagingDirectory)/versionEnvVars ArtifactName: VersionEnvVars - job: RnwNativeBuildDesktop @@ -92,11 +92,11 @@ jobs: displayName: Download VersionEnvVars inputs: artifactName: VersionEnvVars - downloadPath: $(Build.ArtifactStagingDirectory) + downloadPath: $(Build.StagingDirectory) - task: CmdLine@2 inputs: - script: node $(Build.ArtifactStagingDirectory)/versionEnvVars/versionEnvVars.js + script: node $(Build.StagingDirectory)/versionEnvVars/versionEnvVars.js - template: templates/build-rnw.yml parameters: @@ -147,11 +147,11 @@ jobs: displayName: Download VersionEnvVars inputs: artifactName: VersionEnvVars - downloadPath: $(Build.ArtifactStagingDirectory) + downloadPath: $(Build.StagingDirectory) - task: CmdLine@2 inputs: - script: node $(Build.ArtifactStagingDirectory)/versionEnvVars/versionEnvVars.js + script: node $(Build.StagingDirectory)/versionEnvVars/versionEnvVars.js - template: templates/build-rnw.yml parameters: @@ -189,11 +189,11 @@ jobs: displayName: Download VersionEnvVars inputs: artifactName: VersionEnvVars - downloadPath: $(Build.ArtifactStagingDirectory) + downloadPath: $(Build.StagingDirectory) - task: CmdLine@2 inputs: - script: node $(Build.ArtifactStagingDirectory)/VersionEnvVars/versionEnvVars.js + script: node $(Build.StagingDirectory)/VersionEnvVars/versionEnvVars.js # The commit tag in the nuspec requires that we use at least nuget 4.6 - task: NuGetToolInstaller@0 diff --git a/.ado/templates/publish-build-artifacts-for-nuget.yml b/.ado/templates/publish-build-artifacts-for-nuget.yml index 159093fa965..7c94e20addf 100644 --- a/.ado/templates/publish-build-artifacts-for-nuget.yml +++ b/.ado/templates/publish-build-artifacts-for-nuget.yml @@ -9,18 +9,18 @@ steps: displayName: Copy NuGet header files inputs: filePath: vnext/Scripts/Tfs/Layout-Headers.ps1 - arguments: -TargetRoot $(Build.ArtifactStagingDirectory) + arguments: -TargetRoot $(Build.StagingDirectory) condition: ${{ parameters.layoutHeaders }} - task: CopyFiles@2 displayName: Copy NuGet artifacts inputs: sourceFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration) - targetFolder: $(Build.ArtifactStagingDirectory)/$(BuildPlatform)/$(BuildConfiguration) + targetFolder: $(Build.StagingDirectory)/$(BuildPlatform)/$(BuildConfiguration) contents: ${{parameters.contents}} - task: PublishBuildArtifacts@1 displayName: "Publish Artifact: ${{parameters.artifactName}}" inputs: artifactName: ${{parameters.artifactName}} - pathtoPublish: $(Build.ArtifactStagingDirectory) + pathtoPublish: $(Build.StagingDirectory) From 9380e979476044c820b92aeaba8c274e246866c4 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 28 Oct 2019 16:08:27 -0700 Subject: [PATCH 02/17] Use variable templates. --- .ado/publish.yml | 10 ++-------- .ado/templates/build-rnw.yml | 14 +++++++------- .ado/templates/install-SDK.yml | 5 +++-- .ado/templates/react-native-init.yml | 2 ++ .ado/variables/msbuild.yml | 6 ++++++ .ado/variables/vs2017.yml | 4 ++++ .ado/variables/vs2019.yml | 5 +++++ .ado/windows-vs-pr.yml | 17 ++++------------- 8 files changed, 33 insertions(+), 30 deletions(-) create mode 100644 .ado/variables/msbuild.yml create mode 100644 .ado/variables/vs2017.yml create mode 100644 .ado/variables/vs2019.yml diff --git a/.ado/publish.yml b/.ado/publish.yml index 688d8103ea3..e414ecb5716 100644 --- a/.ado/publish.yml +++ b/.ado/publish.yml @@ -1,9 +1,8 @@ name: 0.0.$(Date:yyMM.d)$(Rev:rrr) variables: - VmImage: vs2017-win2016 - VsComponents: Microsoft.VisualStudio.Component.VC.v141.x86.x64 - # VCTargetsPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\Microsoft\VC\v150' + - template: variables/msbuild.yml + - template: variables/vs2017.yml trigger: batch: true @@ -101,12 +100,9 @@ jobs: - template: templates/build-rnw.yml parameters: project: vnext/ReactWindows-Desktop.sln - platformToolset: v141 - vsComponents: $(VsComponents) msbuildArguments: /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" /p:RNW_PKG_VERSION="$(RNW_PKG_VERSION)" -# /p:VCTargetsPath="$(VCTargetsPath)" - template: templates/publish-build-artifacts-for-nuget.yml parameters: @@ -157,8 +153,6 @@ jobs: parameters: project: vnext/ReactWindows-Universal.sln vsComponents: $(VsComponents),Microsoft.VisualStudio.Component.VC.v141.ARM - msbuildArguments: -# /p:VCTargetsPath="$(VCTargetsPath)" - template: templates/publish-build-artifacts-for-nuget.yml parameters: diff --git a/.ado/templates/build-rnw.yml b/.ado/templates/build-rnw.yml index f4db9237960..e3b78af6185 100644 --- a/.ado/templates/build-rnw.yml +++ b/.ado/templates/build-rnw.yml @@ -6,11 +6,10 @@ parameters: # NuGet & MSBuild project: - msbuildVersion: 16.0 - msBuildArchitecture: x64 - preferredToolArchitecture: x64 - platformToolset: v141 - targetPlatformVersion: 10.0.18362.0 + msbuildVersion: $(MSBuildVersion) + msBuildArchitecture: $(MSBuildArchitecture) + preferredToolArchitecture: $(MSBuildPreferredToolArchitecture) + platformToolset: $(MSBuildPlatformToolset) msbuildArguments: '' yarnBuildCmd: build @@ -57,6 +56,8 @@ steps: verbosityRestore: Detailed # Options: quiet, normal, detailed - template: install-SDK.yml + parameters: + sdkVersion: $[variables.SDKVersion] - task: PowerShell@2 displayName: Install Visual Studio dependencies @@ -87,8 +88,7 @@ steps: - task: PublishBuildArtifacts@1 condition: succeededOrFailed() timeoutInMinutes: 10 - inputs: + inputs: pathtoPublish: $(Build.SourcesDirectory)/${{parameters.project}}.log artifactName: Detailed Logs for ${{parameters.project}} $(BuildConfiguration) $(BuildPlatform) publishLocation: 'Container' - diff --git a/.ado/templates/install-SDK.yml b/.ado/templates/install-SDK.yml index 039c0e8520c..0be9d7842d5 100644 --- a/.ado/templates/install-SDK.yml +++ b/.ado/templates/install-SDK.yml @@ -1,5 +1,5 @@ parameters: - sdkVersion: 18362 + sdkVersion: '' steps: - task: powershell@2 @@ -7,4 +7,5 @@ steps: targetType: filePath filePath: vnext\Scripts\Install-WindowsSdkISO.ps1 arguments: ${{ parameters.sdkVersion }} - displayName: 'Install Insider SDK (${{ parameters.sdkVersion }})' \ No newline at end of file + displayName: 'Install Insider SDK (${{ parameters.sdkVersion }})' + condition: ne('', ${{ parameters.sdkVersion }}) \ No newline at end of file diff --git a/.ado/templates/react-native-init.yml b/.ado/templates/react-native-init.yml index effd2a71014..821c5e3ec5e 100644 --- a/.ado/templates/react-native-init.yml +++ b/.ado/templates/react-native-init.yml @@ -65,6 +65,8 @@ steps: restoreSolution: $(Agent.BuildDirectory)\testcli\windows\testcli.sln - template: install-SDK.yml + parameters: + sdkVersion: $[variables.SDKVersion] - task: PowerShell@2 displayName: Install Visual Studio dependencies diff --git a/.ado/variables/msbuild.yml b/.ado/variables/msbuild.yml new file mode 100644 index 00000000000..28531debcfe --- /dev/null +++ b/.ado/variables/msbuild.yml @@ -0,0 +1,6 @@ +variables: + MSBuildArchitecture: x64 + MSBuildPreferredToolArchitecture: x64 + MSBuildPlatformToolset: v141 + TargetPlatformVersion: 10.0.18362.0 + SDKVersion: 18362 diff --git a/.ado/variables/vs2017.yml b/.ado/variables/vs2017.yml new file mode 100644 index 00000000000..325667fefb1 --- /dev/null +++ b/.ado/variables/vs2017.yml @@ -0,0 +1,4 @@ +variables: + VmImage: vs2017-win2016 + MSBuildVersion: 15.0 + GoogleTestAdapterPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\Extensions\drknwe51.xnq' diff --git a/.ado/variables/vs2019.yml b/.ado/variables/vs2019.yml new file mode 100644 index 00000000000..be12a57e389 --- /dev/null +++ b/.ado/variables/vs2019.yml @@ -0,0 +1,5 @@ +variables: + VmImage: windows-2019 + VsComponents: Microsoft.VisualStudio.Component.VC.v141.x86.x64,Microsoft.VisualStudio.ComponentGroup.UWP.VC.v141 + MSBuildVersion: 16.0 + GoogleTestAdapterPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\Extensions\pemwd5jw.szc' diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index be871f3995a..d33f8929355 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -7,14 +7,8 @@ pr: - master variables: - # General / Default - VmImage: vs2017-win2016 - MSBuildVersion: 16.0 - MSBuildArchitecture: x64 - MSBuildPreferredToolArchitecture: x64 - MSBuildPlatformToolset: v141 - TargetPlatformVersion: 10.0.18362.0 - VsComponents: Microsoft.VisualStudio.Component.VC.v141.x86.x64 + - template: variables/msbuild.yml + - template: variables/vs2017.yml jobs: - job: Setup @@ -81,7 +75,6 @@ jobs: yarnBuildCmd: buildci project: vnext/ReactWindows-Universal.sln vsComponents: $(VsComponents),Microsoft.VisualStudio.Component.VC.v141.ARM - msbuildArguments: - template: templates/publish-build-artifacts-for-nuget.yml parameters: @@ -179,8 +172,6 @@ jobs: variables: Desktop.IntegrationTests.Filter: (FullyQualifiedName!~WebSocketJSExecutorIntegrationTest)&(FullyQualifiedName!=RNTesterIntegrationTests::WebSocket)&(FullyQualifiedName!~WebSocket) - GoogleTestAdapterPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\Extensions\drknwe51.xnq' - # VCTargetsPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\Microsoft\VC\v150' steps: - checkout: self @@ -195,8 +186,6 @@ jobs: parameters: yarnBuildCmd: buildci project: vnext/ReactWindows-Desktop.sln - platformToolset: v141 - vsComponents: $(VsComponents) msbuildArguments: /p:RNW_PKG_VERSION_STR="Private Build" /p:RNW_PKG_VERSION="1000,0,0,0" @@ -442,6 +431,8 @@ jobs: workingDirectory: current - template: templates\install-SDK.yml + parameters: + sdkVersion: $[variables.SDKVersion] - task: PowerShell@2 displayName: Install Visual Studio dependencies From b3c871a5684d759bc7de6080aa2d7031133d1c43 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 28 Oct 2019 16:14:55 -0700 Subject: [PATCH 03/17] Use $(SDKVersion). --- .ado/templates/build-rnw.yml | 2 +- .ado/templates/react-native-init.yml | 2 +- .ado/windows-vs-pr.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ado/templates/build-rnw.yml b/.ado/templates/build-rnw.yml index e3b78af6185..c11ba715bf4 100644 --- a/.ado/templates/build-rnw.yml +++ b/.ado/templates/build-rnw.yml @@ -57,7 +57,7 @@ steps: - template: install-SDK.yml parameters: - sdkVersion: $[variables.SDKVersion] + sdkVersion: $(SDKVersion) - task: PowerShell@2 displayName: Install Visual Studio dependencies diff --git a/.ado/templates/react-native-init.yml b/.ado/templates/react-native-init.yml index 821c5e3ec5e..1595208091d 100644 --- a/.ado/templates/react-native-init.yml +++ b/.ado/templates/react-native-init.yml @@ -66,7 +66,7 @@ steps: - template: install-SDK.yml parameters: - sdkVersion: $[variables.SDKVersion] + sdkVersion: $(SDKVersion) - task: PowerShell@2 displayName: Install Visual Studio dependencies diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index d33f8929355..0f2d4c50706 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -432,7 +432,7 @@ jobs: - template: templates\install-SDK.yml parameters: - sdkVersion: $[variables.SDKVersion] + sdkVersion: $(SDKVersion) - task: PowerShell@2 displayName: Install Visual Studio dependencies From af4c2e672834b861e2a5f50153a59a77e49d94d2 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 28 Oct 2019 16:21:09 -0700 Subject: [PATCH 04/17] Update --- .ado/templates/install-SDK.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/templates/install-SDK.yml b/.ado/templates/install-SDK.yml index 0be9d7842d5..45e02e814d5 100644 --- a/.ado/templates/install-SDK.yml +++ b/.ado/templates/install-SDK.yml @@ -8,4 +8,4 @@ steps: filePath: vnext\Scripts\Install-WindowsSdkISO.ps1 arguments: ${{ parameters.sdkVersion }} displayName: 'Install Insider SDK (${{ parameters.sdkVersion }})' - condition: ne('', ${{ parameters.sdkVersion }}) \ No newline at end of file + condition: ne('', $[parameters.sdkVersion]) \ No newline at end of file From 84ff8231eb12d2817d23978eb9f85323ffbcfa48 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 28 Oct 2019 16:27:42 -0700 Subject: [PATCH 05/17] Update --- .ado/templates/build-rnw.yml | 2 +- .ado/templates/install-SDK.yml | 2 +- .ado/templates/react-native-init.yml | 2 +- .ado/windows-vs-pr.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ado/templates/build-rnw.yml b/.ado/templates/build-rnw.yml index c11ba715bf4..e3b78af6185 100644 --- a/.ado/templates/build-rnw.yml +++ b/.ado/templates/build-rnw.yml @@ -57,7 +57,7 @@ steps: - template: install-SDK.yml parameters: - sdkVersion: $(SDKVersion) + sdkVersion: $[variables.SDKVersion] - task: PowerShell@2 displayName: Install Visual Studio dependencies diff --git a/.ado/templates/install-SDK.yml b/.ado/templates/install-SDK.yml index 45e02e814d5..93f3037ea71 100644 --- a/.ado/templates/install-SDK.yml +++ b/.ado/templates/install-SDK.yml @@ -8,4 +8,4 @@ steps: filePath: vnext\Scripts\Install-WindowsSdkISO.ps1 arguments: ${{ parameters.sdkVersion }} displayName: 'Install Insider SDK (${{ parameters.sdkVersion }})' - condition: ne('', $[parameters.sdkVersion]) \ No newline at end of file + condition: ne('', '${{ parameters.sdkVersion }}') \ No newline at end of file diff --git a/.ado/templates/react-native-init.yml b/.ado/templates/react-native-init.yml index 1595208091d..821c5e3ec5e 100644 --- a/.ado/templates/react-native-init.yml +++ b/.ado/templates/react-native-init.yml @@ -66,7 +66,7 @@ steps: - template: install-SDK.yml parameters: - sdkVersion: $(SDKVersion) + sdkVersion: $[variables.SDKVersion] - task: PowerShell@2 displayName: Install Visual Studio dependencies diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 0f2d4c50706..d33f8929355 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -432,7 +432,7 @@ jobs: - template: templates\install-SDK.yml parameters: - sdkVersion: $(SDKVersion) + sdkVersion: $[variables.SDKVersion] - task: PowerShell@2 displayName: Install Visual Studio dependencies From 5efe1e94aaee47a3b3ca9796f704dfb2eb6d93b9 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 28 Oct 2019 16:36:11 -0700 Subject: [PATCH 06/17] Update --- .ado/templates/build-rnw.yml | 2 +- .ado/templates/react-native-init.yml | 2 +- .ado/windows-vs-pr.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ado/templates/build-rnw.yml b/.ado/templates/build-rnw.yml index e3b78af6185..c11ba715bf4 100644 --- a/.ado/templates/build-rnw.yml +++ b/.ado/templates/build-rnw.yml @@ -57,7 +57,7 @@ steps: - template: install-SDK.yml parameters: - sdkVersion: $[variables.SDKVersion] + sdkVersion: $(SDKVersion) - task: PowerShell@2 displayName: Install Visual Studio dependencies diff --git a/.ado/templates/react-native-init.yml b/.ado/templates/react-native-init.yml index 821c5e3ec5e..1595208091d 100644 --- a/.ado/templates/react-native-init.yml +++ b/.ado/templates/react-native-init.yml @@ -66,7 +66,7 @@ steps: - template: install-SDK.yml parameters: - sdkVersion: $[variables.SDKVersion] + sdkVersion: $(SDKVersion) - task: PowerShell@2 displayName: Install Visual Studio dependencies diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index d33f8929355..0f2d4c50706 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -432,7 +432,7 @@ jobs: - template: templates\install-SDK.yml parameters: - sdkVersion: $[variables.SDKVersion] + sdkVersion: $(SDKVersion) - task: PowerShell@2 displayName: Install Visual Studio dependencies From a19053f640995109f9db7522c33993b4cba616ab Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 28 Oct 2019 18:45:10 -0700 Subject: [PATCH 07/17] Default Universal to x64. --- vnext/ReactWindows-Universal.sln | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vnext/ReactWindows-Universal.sln b/vnext/ReactWindows-Universal.sln index a7c45b36cf0..7a982c30a4a 100644 --- a/vnext/ReactWindows-Universal.sln +++ b/vnext/ReactWindows-Universal.sln @@ -100,12 +100,12 @@ Global Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release|ARM = Release|ARM + Debug|ARM = Debug|ARM Release|x64 = Release|x64 Release|x86 = Release|x86 + Release|ARM = Release|ARM EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.ActiveCfg = Debug|ARM From 71aa1961c0c19d6b1bd6aade54011f5d9224a9d4 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 28 Oct 2019 21:38:10 -0700 Subject: [PATCH 08/17] Rename back to Build.ArtifactStagingDirectory. --- .ado/publish.yml | 16 ++++++++-------- .../publish-build-artifacts-for-nuget.yml | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.ado/publish.yml b/.ado/publish.yml index e414ecb5716..2461c51e4df 100644 --- a/.ado/publish.yml +++ b/.ado/publish.yml @@ -58,12 +58,12 @@ jobs: inputs: script: node ./.ado/setVersionEnvVars.js env: - RUNNER_TEMP: $(Build.StagingDirectory) + RUNNER_TEMP: $(Build.ArtifactStagingDirectory) - task: PublishBuildArtifacts@1 displayName: Publish VersionEnvVars inputs: - PathtoPublish: $(Build.StagingDirectory)/versionEnvVars + PathtoPublish: $(Build.ArtifactStagingDirectory)/versionEnvVars ArtifactName: VersionEnvVars - job: RnwNativeBuildDesktop @@ -91,11 +91,11 @@ jobs: displayName: Download VersionEnvVars inputs: artifactName: VersionEnvVars - downloadPath: $(Build.StagingDirectory) + downloadPath: $(Build.ArtifactStagingDirectory) - task: CmdLine@2 inputs: - script: node $(Build.StagingDirectory)/versionEnvVars/versionEnvVars.js + script: node $(Build.ArtifactStagingDirectory)/versionEnvVars/versionEnvVars.js - template: templates/build-rnw.yml parameters: @@ -143,11 +143,11 @@ jobs: displayName: Download VersionEnvVars inputs: artifactName: VersionEnvVars - downloadPath: $(Build.StagingDirectory) + downloadPath: $(Build.ArtifactStagingDirectory) - task: CmdLine@2 inputs: - script: node $(Build.StagingDirectory)/versionEnvVars/versionEnvVars.js + script: node $(Build.ArtifactStagingDirectory)/versionEnvVars/versionEnvVars.js - template: templates/build-rnw.yml parameters: @@ -183,11 +183,11 @@ jobs: displayName: Download VersionEnvVars inputs: artifactName: VersionEnvVars - downloadPath: $(Build.StagingDirectory) + downloadPath: $(Build.ArtifactStagingDirectory) - task: CmdLine@2 inputs: - script: node $(Build.StagingDirectory)/VersionEnvVars/versionEnvVars.js + script: node $(Build.ArtifactStagingDirectory)/VersionEnvVars/versionEnvVars.js # The commit tag in the nuspec requires that we use at least nuget 4.6 - task: NuGetToolInstaller@0 diff --git a/.ado/templates/publish-build-artifacts-for-nuget.yml b/.ado/templates/publish-build-artifacts-for-nuget.yml index 7c94e20addf..159093fa965 100644 --- a/.ado/templates/publish-build-artifacts-for-nuget.yml +++ b/.ado/templates/publish-build-artifacts-for-nuget.yml @@ -9,18 +9,18 @@ steps: displayName: Copy NuGet header files inputs: filePath: vnext/Scripts/Tfs/Layout-Headers.ps1 - arguments: -TargetRoot $(Build.StagingDirectory) + arguments: -TargetRoot $(Build.ArtifactStagingDirectory) condition: ${{ parameters.layoutHeaders }} - task: CopyFiles@2 displayName: Copy NuGet artifacts inputs: sourceFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration) - targetFolder: $(Build.StagingDirectory)/$(BuildPlatform)/$(BuildConfiguration) + targetFolder: $(Build.ArtifactStagingDirectory)/$(BuildPlatform)/$(BuildConfiguration) contents: ${{parameters.contents}} - task: PublishBuildArtifacts@1 displayName: "Publish Artifact: ${{parameters.artifactName}}" inputs: artifactName: ${{parameters.artifactName}} - pathtoPublish: $(Build.StagingDirectory) + pathtoPublish: $(Build.ArtifactStagingDirectory) From ddcf1e4015f47ece6d490d292ef2c7d968f5678d Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 28 Oct 2019 21:56:35 -0700 Subject: [PATCH 09/17] Change files --- ...ndows-2019-10-28-21-56-35-DevOps-varsfromtemplate.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 change/react-native-windows-2019-10-28-21-56-35-DevOps-varsfromtemplate.json diff --git a/change/react-native-windows-2019-10-28-21-56-35-DevOps-varsfromtemplate.json b/change/react-native-windows-2019-10-28-21-56-35-DevOps-varsfromtemplate.json new file mode 100644 index 00000000000..21335a77a0d --- /dev/null +++ b/change/react-native-windows-2019-10-28-21-56-35-DevOps-varsfromtemplate.json @@ -0,0 +1,8 @@ +{ + "type": "none", + "comment": "Rename back to Build.ArtifactStagingDirectory.", + "packageName": "react-native-windows", + "email": "julio.rocha@microsoft.com", + "commit": "71aa1961c0c19d6b1bd6aade54011f5d9224a9d4", + "date": "2019-10-29T04:56:35.311Z" +} \ No newline at end of file From ecfee04f61f90cd5d12a04cf54034bde630572c9 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 28 Oct 2019 22:54:33 -0700 Subject: [PATCH 10/17] Update --- vnext/Directory.Build.targets | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/vnext/Directory.Build.targets b/vnext/Directory.Build.targets index a93bc8eb44d..89a4ca84ee4 100644 --- a/vnext/Directory.Build.targets +++ b/vnext/Directory.Build.targets @@ -47,4 +47,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From abde2e4ce85ac533671b7abd882858f8d01d54a9 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 28 Oct 2019 22:54:59 -0700 Subject: [PATCH 11/17] Update --- .ado/templates/build-rnw.yml | 22 +++++++++++++++++++++- .ado/windows-vs-pr.yml | 4 ---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.ado/templates/build-rnw.yml b/.ado/templates/build-rnw.yml index c11ba715bf4..85ddf713b8c 100644 --- a/.ado/templates/build-rnw.yml +++ b/.ado/templates/build-rnw.yml @@ -70,6 +70,26 @@ steps: -Collect:$${{ parameters.debug }} condition: and(ne('${{parameters.vsComponents}}', ''), eq(variables['VmImage'], 'windows-2019')) + - task: MSBuild@1 + inputs: + solution: ${{parameters.project}} + msbuildVersion: latest + msbuildArchitecture: x64 + platform: $(BuildPlatform) + configuration: $(BuildConfiguration) + msbuildArguments: + /t:Vars + + - task: MSBuild@1 + inputs: + solution: $(Build.SourcesDirectory)/vnext/Universal.IntegrationTests/React.Windows.Universal.IntegrationTests.vcxproj + msbuildVersion: latest + msbuildArchitecture: x64 + platform: $(BuildPlatform) + configuration: $(BuildConfiguration) + msbuildArguments: + /t:GH3548 + - task: MSBuild@1 displayName: MSBuild ${{parameters.project}} inputs: @@ -89,6 +109,6 @@ steps: condition: succeededOrFailed() timeoutInMinutes: 10 inputs: - pathtoPublish: $(Build.SourcesDirectory)/${{parameters.project}}.log + pathtoPublish: $(Build.SourcesDirectory)/${{parameters.project}}.log artifactName: Detailed Logs for ${{parameters.project}} $(BuildConfiguration) $(BuildPlatform) publishLocation: 'Container' diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 0f2d4c50706..0be4804da64 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -65,10 +65,6 @@ jobs: clean: false submodules: false - # #TODO: Remove - # - powershell: | - # ls 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\Extensions\' -Name -Recurse -Include '*GoogleTest*' - - template: templates/build-rnw.yml parameters: useRnFork: $(UseRNFork) From 164b5345b387d05fe4f3c25b6e7aaf366883a27c Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 28 Oct 2019 23:16:54 -0700 Subject: [PATCH 12/17] Set WindowsSdkPath. --- .ado/variables/msbuild.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.ado/variables/msbuild.yml b/.ado/variables/msbuild.yml index 28531debcfe..c62c3829262 100644 --- a/.ado/variables/msbuild.yml +++ b/.ado/variables/msbuild.yml @@ -3,4 +3,5 @@ variables: MSBuildPreferredToolArchitecture: x64 MSBuildPlatformToolset: v141 TargetPlatformVersion: 10.0.18362.0 + WindowsSdkPath: C:\Program Files (x86)\Windows Kits\10\ SDKVersion: 18362 From e89705f2eb0f9fbae7b1055492ac1059923457c2 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 28 Oct 2019 23:21:20 -0700 Subject: [PATCH 13/17] Update --- .ado/templates/build-rnw.yml | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/.ado/templates/build-rnw.yml b/.ado/templates/build-rnw.yml index 85ddf713b8c..eaca3ee8375 100644 --- a/.ado/templates/build-rnw.yml +++ b/.ado/templates/build-rnw.yml @@ -70,25 +70,15 @@ steps: -Collect:$${{ parameters.debug }} condition: and(ne('${{parameters.vsComponents}}', ''), eq(variables['VmImage'], 'windows-2019')) - - task: MSBuild@1 - inputs: - solution: ${{parameters.project}} - msbuildVersion: latest - msbuildArchitecture: x64 - platform: $(BuildPlatform) - configuration: $(BuildConfiguration) - msbuildArguments: - /t:Vars - - - task: MSBuild@1 - inputs: - solution: $(Build.SourcesDirectory)/vnext/Universal.IntegrationTests/React.Windows.Universal.IntegrationTests.vcxproj - msbuildVersion: latest - msbuildArchitecture: x64 - platform: $(BuildPlatform) - configuration: $(BuildConfiguration) - msbuildArguments: - /t:GH3548 + # - task: MSBuild@1 + # inputs: + # solution: $(Build.SourcesDirectory)/vnext/Universal.UnitTests/React.Windows.Universal.UnitTests.vcxproj + # msbuildVersion: latest + # msbuildArchitecture: x64 + # platform: $(BuildPlatform) + # configuration: $(BuildConfiguration) + # msbuildArguments: + # /t:GH3548 - task: MSBuild@1 displayName: MSBuild ${{parameters.project}} From fa5b4332c62de0632405255a1857dfe14e487ff3 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 28 Oct 2019 23:55:47 -0700 Subject: [PATCH 14/17] Rename SDKVersion to Win10Version. --- .ado/templates/build-rnw.yml | 2 +- .ado/templates/react-native-init.yml | 4 ++-- .ado/variables/msbuild.yml | 2 +- .ado/windows-vs-pr.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ado/templates/build-rnw.yml b/.ado/templates/build-rnw.yml index eaca3ee8375..4b9559c5c2b 100644 --- a/.ado/templates/build-rnw.yml +++ b/.ado/templates/build-rnw.yml @@ -57,7 +57,7 @@ steps: - template: install-SDK.yml parameters: - sdkVersion: $(SDKVersion) + sdkVersion: $(Win10Version) - task: PowerShell@2 displayName: Install Visual Studio dependencies diff --git a/.ado/templates/react-native-init.yml b/.ado/templates/react-native-init.yml index bb12b7a6681..acfd91a3fd9 100644 --- a/.ado/templates/react-native-init.yml +++ b/.ado/templates/react-native-init.yml @@ -66,7 +66,7 @@ steps: - template: install-SDK.yml parameters: - sdkVersion: $(SDKVersion) + sdkVersion: $(Win10Version) - task: PowerShell@2 displayName: Install Visual Studio dependencies @@ -95,7 +95,7 @@ steps: - task: PublishBuildArtifacts@1 condition: succeededOrFailed() timeoutInMinutes: 10 - inputs: + inputs: pathtoPublish: $(Agent.BuildDirectory)/testcli/windows/testcli.sln.log artifactName: Detailed Logs for testcli.sln ${{ parameters.platform }} ${{ parameters.configuration }} publishLocation: 'Container' diff --git a/.ado/variables/msbuild.yml b/.ado/variables/msbuild.yml index c62c3829262..a2e7b32eb4c 100644 --- a/.ado/variables/msbuild.yml +++ b/.ado/variables/msbuild.yml @@ -4,4 +4,4 @@ variables: MSBuildPlatformToolset: v141 TargetPlatformVersion: 10.0.18362.0 WindowsSdkPath: C:\Program Files (x86)\Windows Kits\10\ - SDKVersion: 18362 + Win10Version: 18362 diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 0be4804da64..c218342eb76 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -428,7 +428,7 @@ jobs: - template: templates\install-SDK.yml parameters: - sdkVersion: $(SDKVersion) + sdkVersion: $(Win10Version) - task: PowerShell@2 displayName: Install Visual Studio dependencies From 341a33236c0e31ec1442a1b95aaaf5c01f155d35 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 29 Oct 2019 01:09:37 -0700 Subject: [PATCH 15/17] Drop WindowsSdkPath. --- .ado/templates/build-rnw.yml | 10 ---------- .ado/variables/msbuild.yml | 1 - vnext/Directory.Build.targets | 30 ------------------------------ 3 files changed, 41 deletions(-) diff --git a/.ado/templates/build-rnw.yml b/.ado/templates/build-rnw.yml index 4b9559c5c2b..2bbce3c21dc 100644 --- a/.ado/templates/build-rnw.yml +++ b/.ado/templates/build-rnw.yml @@ -70,16 +70,6 @@ steps: -Collect:$${{ parameters.debug }} condition: and(ne('${{parameters.vsComponents}}', ''), eq(variables['VmImage'], 'windows-2019')) - # - task: MSBuild@1 - # inputs: - # solution: $(Build.SourcesDirectory)/vnext/Universal.UnitTests/React.Windows.Universal.UnitTests.vcxproj - # msbuildVersion: latest - # msbuildArchitecture: x64 - # platform: $(BuildPlatform) - # configuration: $(BuildConfiguration) - # msbuildArguments: - # /t:GH3548 - - task: MSBuild@1 displayName: MSBuild ${{parameters.project}} inputs: diff --git a/.ado/variables/msbuild.yml b/.ado/variables/msbuild.yml index a2e7b32eb4c..a535c0d7d37 100644 --- a/.ado/variables/msbuild.yml +++ b/.ado/variables/msbuild.yml @@ -3,5 +3,4 @@ variables: MSBuildPreferredToolArchitecture: x64 MSBuildPlatformToolset: v141 TargetPlatformVersion: 10.0.18362.0 - WindowsSdkPath: C:\Program Files (x86)\Windows Kits\10\ Win10Version: 18362 diff --git a/vnext/Directory.Build.targets b/vnext/Directory.Build.targets index 89a4ca84ee4..a93bc8eb44d 100644 --- a/vnext/Directory.Build.targets +++ b/vnext/Directory.Build.targets @@ -47,34 +47,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 7d44d37b5f3cacda81aee9c71d4c3c098b773d72 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 29 Oct 2019 01:11:11 -0700 Subject: [PATCH 16/17] Use Build.StagingDirectory. --- .ado/publish.yml | 16 ++++++++-------- .../publish-build-artifacts-for-nuget.yml | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.ado/publish.yml b/.ado/publish.yml index 2461c51e4df..e414ecb5716 100644 --- a/.ado/publish.yml +++ b/.ado/publish.yml @@ -58,12 +58,12 @@ jobs: inputs: script: node ./.ado/setVersionEnvVars.js env: - RUNNER_TEMP: $(Build.ArtifactStagingDirectory) + RUNNER_TEMP: $(Build.StagingDirectory) - task: PublishBuildArtifacts@1 displayName: Publish VersionEnvVars inputs: - PathtoPublish: $(Build.ArtifactStagingDirectory)/versionEnvVars + PathtoPublish: $(Build.StagingDirectory)/versionEnvVars ArtifactName: VersionEnvVars - job: RnwNativeBuildDesktop @@ -91,11 +91,11 @@ jobs: displayName: Download VersionEnvVars inputs: artifactName: VersionEnvVars - downloadPath: $(Build.ArtifactStagingDirectory) + downloadPath: $(Build.StagingDirectory) - task: CmdLine@2 inputs: - script: node $(Build.ArtifactStagingDirectory)/versionEnvVars/versionEnvVars.js + script: node $(Build.StagingDirectory)/versionEnvVars/versionEnvVars.js - template: templates/build-rnw.yml parameters: @@ -143,11 +143,11 @@ jobs: displayName: Download VersionEnvVars inputs: artifactName: VersionEnvVars - downloadPath: $(Build.ArtifactStagingDirectory) + downloadPath: $(Build.StagingDirectory) - task: CmdLine@2 inputs: - script: node $(Build.ArtifactStagingDirectory)/versionEnvVars/versionEnvVars.js + script: node $(Build.StagingDirectory)/versionEnvVars/versionEnvVars.js - template: templates/build-rnw.yml parameters: @@ -183,11 +183,11 @@ jobs: displayName: Download VersionEnvVars inputs: artifactName: VersionEnvVars - downloadPath: $(Build.ArtifactStagingDirectory) + downloadPath: $(Build.StagingDirectory) - task: CmdLine@2 inputs: - script: node $(Build.ArtifactStagingDirectory)/VersionEnvVars/versionEnvVars.js + script: node $(Build.StagingDirectory)/VersionEnvVars/versionEnvVars.js # The commit tag in the nuspec requires that we use at least nuget 4.6 - task: NuGetToolInstaller@0 diff --git a/.ado/templates/publish-build-artifacts-for-nuget.yml b/.ado/templates/publish-build-artifacts-for-nuget.yml index 159093fa965..7c94e20addf 100644 --- a/.ado/templates/publish-build-artifacts-for-nuget.yml +++ b/.ado/templates/publish-build-artifacts-for-nuget.yml @@ -9,18 +9,18 @@ steps: displayName: Copy NuGet header files inputs: filePath: vnext/Scripts/Tfs/Layout-Headers.ps1 - arguments: -TargetRoot $(Build.ArtifactStagingDirectory) + arguments: -TargetRoot $(Build.StagingDirectory) condition: ${{ parameters.layoutHeaders }} - task: CopyFiles@2 displayName: Copy NuGet artifacts inputs: sourceFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration) - targetFolder: $(Build.ArtifactStagingDirectory)/$(BuildPlatform)/$(BuildConfiguration) + targetFolder: $(Build.StagingDirectory)/$(BuildPlatform)/$(BuildConfiguration) contents: ${{parameters.contents}} - task: PublishBuildArtifacts@1 displayName: "Publish Artifact: ${{parameters.artifactName}}" inputs: artifactName: ${{parameters.artifactName}} - pathtoPublish: $(Build.ArtifactStagingDirectory) + pathtoPublish: $(Build.StagingDirectory) From eb8ca1d6ee189d60974a315946c38ec2e86309b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20C=C3=A9sar=20Rocha?= Date: Tue, 29 Oct 2019 04:50:43 -0700 Subject: [PATCH 17/17] Update windows-vs-pr.yml --- .ado/windows-vs-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index c218342eb76..c742547cb1b 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -167,7 +167,7 @@ jobs: cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them variables: - Desktop.IntegrationTests.Filter: (FullyQualifiedName!~WebSocketJSExecutorIntegrationTest)&(FullyQualifiedName!=RNTesterIntegrationTests::WebSocket)&(FullyQualifiedName!~WebSocket) + Desktop.IntegrationTests.Filter: (FullyQualifiedName!~WebSocketJSExecutorIntegrationTest)&(FullyQualifiedName!~WebSocket) steps: - checkout: self