diff --git a/.ado/templates/prep-and-pack-nuget.yml b/.ado/templates/prep-and-pack-nuget.yml index 466b7a191e6..b7ce2fcb293 100644 --- a/.ado/templates/prep-and-pack-nuget.yml +++ b/.ado/templates/prep-and-pack-nuget.yml @@ -36,41 +36,20 @@ steps: artifactName: ReactWindows-source downloadPath: $(System.DefaultWorkingDirectory) - - task: CopyFiles@2 - displayName: 'Copy Win32 debug x64 files' - inputs: - SourceFolder: '$(System.DefaultWorkingDirectory)/ReactWindows-debug-x64' - TargetFolder: '$(System.DefaultWorkingDirectory)/NugetRoot/target/x64/Debug' - - task: CopyFiles@2 - displayName: 'Copy Win32 debug x86 files' - inputs: - SourceFolder: '$(System.DefaultWorkingDirectory)/ReactWindows-debug-x86' - TargetFolder: '$(System.DefaultWorkingDirectory)/NugetRoot/target/x86/Debug' - - task: CopyFiles@2 - displayName: 'Copy Win32 ship x64 files' - inputs: - SourceFolder: '$(System.DefaultWorkingDirectory)/ReactWindows-ship-x64' - TargetFolder: '$(System.DefaultWorkingDirectory)/NugetRoot/target/x64/ship' - - task: CopyFiles@2 - displayName: 'Copy Win32 ship x86 files' - inputs: - SourceFolder: '$(System.DefaultWorkingDirectory)/ReactWindows-ship-x86' - TargetFolder: '$(System.DefaultWorkingDirectory)/NugetRoot/target/x86/ship' - - task: CopyFiles@2 - displayName: 'Copy arm debug' - inputs: - SourceFolder: '$(System.DefaultWorkingDirectory)/ReactWindows-debug-arm' - TargetFolder: '$(System.DefaultWorkingDirectory)/NugetRoot/target/arm/debug' - - task: CopyFiles@2 - displayName: 'Copy arm ship' - inputs: - SourceFolder: '$(System.DefaultWorkingDirectory)/ReactWindows-ship-arm' - TargetFolder: '$(System.DefaultWorkingDirectory)/NugetRoot/target/arm/ship' - - task: CopyFiles@2 - displayName: 'Copy Nuget source files' + - task: PowerShell@2 + displayName: Copy files from build artifacts to nuget root inputs: - SourceFolder: '$(System.DefaultWorkingDirectory)/ReactWindows-source' - TargetFolder: '$(System.DefaultWorkingDirectory)/NugetRoot' + ignoreLASTEXITCODE: true + targetType: inline # filePath | inline + script: | + robocopy $(System.DefaultWorkingDirectory)\ReactWindows-source $(System.DefaultWorkingDirectory)\NugetRoot /E /MOVE /NP + robocopy $(System.DefaultWorkingDirectory)\ReactWindows-debug-x64 $(System.DefaultWorkingDirectory)\NugetRoot\target\x64\Debug /E /MOVE /NP + robocopy $(System.DefaultWorkingDirectory)\ReactWindows-debug-x86 $(System.DefaultWorkingDirectory)\NugetRoot\target\x86\Debug /E /MOVE /NP + robocopy $(System.DefaultWorkingDirectory)\ReactWindows-ship-x64 $(System.DefaultWorkingDirectory)\NugetRoot\target\x64\ship /E /MOVE /NP + robocopy $(System.DefaultWorkingDirectory)\ReactWindows-ship-x86 $(System.DefaultWorkingDirectory)\NugetRoot\target\x86\ship /E /MOVE /NP + 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: @@ -84,6 +63,7 @@ steps: } (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: diff --git a/.ado/templates/publish-build-artifacts-for-nuget.yml b/.ado/templates/publish-build-artifacts-for-nuget.yml index 5aa1065b650..d177ea60acb 100644 --- a/.ado/templates/publish-build-artifacts-for-nuget.yml +++ b/.ado/templates/publish-build-artifacts-for-nuget.yml @@ -1,6 +1,4 @@ - steps: - - task: BatchScript@1 displayName: 'Copy Nuget source files' inputs: diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 6bc06ec3953..6f1aa68848f 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -60,7 +60,7 @@ jobs: command: restore restoreSolution: vnext/ReactWindows-UWP.sln feedsToUse: config - nugetConfigPath: vnext/NuGet.NoOffice.config + nugetConfigPath: vnext/NuGet.config restoreDirectory: packages/ verbosityRestore: Detailed # Options: quiet, normal, detailed @@ -81,7 +81,7 @@ jobs: command: restore restoreSolution: vnext/Playground/Playground.sln feedsToUse: config - nugetConfigPath: vnext/NuGet.NoOffice.config + nugetConfigPath: vnext/NuGet.config restoreDirectory: packages/ verbosityRestore: Detailed # Options: quiet, normal, detailed @@ -131,8 +131,7 @@ jobs: BuildConfiguration: Release BuildPlatform: arm pool: - name: OE Standard Pool - demands: ['VisualStudio_15.0', 'OnPrem -equals False'] + vmImage: vs2017-win2016 timeoutInMinutes: 120 # 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: @@ -143,8 +142,20 @@ jobs: 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 - - template: templates/npm-install-and-build.yml + - task: CmdLine@2 + displayName: yarn install + inputs: + script: yarn install --frozen-lockfile + workingDirectory: vnext + + - template: templates/stop-packagers.yml + - task: CmdLine@2 + displayName: yarn build + inputs: + script: yarn build + workingDirectory: vnext + - template: templates/vs-build.yml parameters: BuildConfiguration: $(BuildConfiguration) @@ -152,7 +163,7 @@ jobs: - task: VSTest@2 displayName: Run Desktop Unit Tests - timeoutInMinutes: 10 # Set smaller timeout for UTs, since there have been some hangs, and this allows the job to timeout quicker + timeoutInMinutes: 5 # Set smaller timeout for UTs, since there have been some hangs, and this allows the job to timeout quicker condition: and(succeeded(), ne(variables['BuildPlatform'], 'ARM')) inputs: testSelector: 'testAssemblies' # Options: testAssemblies, testPlan, testRun @@ -169,7 +180,7 @@ jobs: #vstestLocationMethod: 'version' # Optional. Options: version, location vsTestVersion: '15.0' # Optional. Options: latest, 15.0, 14.0, toolsInstaller #vstestLocation: # Optional - #runSettingsFile: # Optional + runSettingsFile: $(Build.SourcesDirectory)\vnext\Desktop.UnitTests\tests.runsettings # Optional #overrideTestrunParameters: # Optional #pathtoCustomTestAdapters: # Optional #runInParallel: False # Optional @@ -255,7 +266,7 @@ jobs: dependsOn: RnwNativePRBuild displayName: React-Native-Windows Build and Pack Nuget pool: - name: OE Standard Pool + vmImage: vs2017-win2016 steps: - checkout: none #skip checking out the default repository resource diff --git a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj index 0450e9fa76c..ba71fea2de5 100644 --- a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj +++ b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj @@ -147,7 +147,7 @@ - + @@ -157,6 +157,6 @@ - + \ No newline at end of file diff --git a/vnext/Desktop.DLL/packages.config b/vnext/Desktop.DLL/packages.config index 45e6ddc4b1e..108f4b4577d 100644 --- a/vnext/Desktop.DLL/packages.config +++ b/vnext/Desktop.DLL/packages.config @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj index 5de62a4c9a6..bd6fc032bae 100644 --- a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj +++ b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj @@ -137,7 +137,7 @@ - + @@ -147,7 +147,7 @@ - + diff --git a/vnext/Desktop.IntegrationTests/packages.config b/vnext/Desktop.IntegrationTests/packages.config index 45e6ddc4b1e..108f4b4577d 100644 --- a/vnext/Desktop.IntegrationTests/packages.config +++ b/vnext/Desktop.IntegrationTests/packages.config @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/vnext/Desktop.UnitTests/BaseWebSocketTests.cpp b/vnext/Desktop.UnitTests/BaseWebSocketTests.cpp index 0b5ea05a108..e0a0e3ca098 100644 --- a/vnext/Desktop.UnitTests/BaseWebSocketTests.cpp +++ b/vnext/Desktop.UnitTests/BaseWebSocketTests.cpp @@ -21,6 +21,10 @@ using Error = IWebSocket::Error; TEST_CLASS(BaseWebSocketTest) { + BEGIN_TEST_CLASS_ATTRIBUTE() + TEST_CLASS_ATTRIBUTE(L"Ignore", L"true") + END_TEST_CLASS_ATTRIBUTE() + TEST_METHOD(CreateAndSetHandlers) { auto ws = make_unique(Url("ws://localhost")); diff --git a/vnext/Desktop.UnitTests/tests.runsettings b/vnext/Desktop.UnitTests/tests.runsettings new file mode 100644 index 00000000000..9f0a7fa8140 --- /dev/null +++ b/vnext/Desktop.UnitTests/tests.runsettings @@ -0,0 +1,8 @@ + + + + + + 10000 + + \ No newline at end of file diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj index e7020b82b49..f5f90fafd7b 100644 --- a/vnext/Desktop/React.Windows.Desktop.vcxproj +++ b/vnext/Desktop/React.Windows.Desktop.vcxproj @@ -163,7 +163,7 @@ - + @@ -173,6 +173,6 @@ - + \ No newline at end of file diff --git a/vnext/Desktop/packages.config b/vnext/Desktop/packages.config index 45e6ddc4b1e..108f4b4577d 100644 --- a/vnext/Desktop/packages.config +++ b/vnext/Desktop/packages.config @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/vnext/NuGet.Config b/vnext/NuGet.Config index e90b452b046..8d20b78648d 100644 --- a/vnext/NuGet.Config +++ b/vnext/NuGet.Config @@ -8,8 +8,6 @@ - - diff --git a/vnext/NuGet.NoOffice.Config b/vnext/NuGet.NoOffice.Config deleted file mode 100644 index 8d20b78648d..00000000000 --- a/vnext/NuGet.NoOffice.Config +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/vnext/ReactWindows-UWP.sln b/vnext/ReactWindows-UWP.sln index c5324033ca8..a7fa08413bd 100644 --- a/vnext/ReactWindows-UWP.sln +++ b/vnext/ReactWindows-UWP.sln @@ -33,7 +33,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig Directory.Build.props = Directory.Build.props - NuGet.Config = NuGet.NoOffice.Config + NuGet.Config = NuGet.Config ReactUwp.nuspec = ReactUwp.nuspec README.md = README.md EndProjectSection