Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .ado/templates/prep-and-pack-nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ parameters:
microsoftRNId: 'Microsoft.ReactNative'
universalId: 'OfficeReact.UWP'
slices: '("x64.Release", "x64.Debug", "x86.Release", "x86.Debug", "ARM.Release", "ARM.Debug", "ARM64.Release", "ARM64.Debug")'
packDesktop: true
packMicrosoft: true
packUniversal: true

steps:
- task: DownloadBuildArtifacts@0
Expand All @@ -22,13 +25,15 @@ steps:
targetType: filePath
filePath: $(System.DefaultWorkingDirectory)\ReactWindows\StripAdditionalPlatformsFromNuspec.ps1
arguments: -nuspec $(System.DefaultWorkingDirectory)/ReactWindows/ReactUWP.nuspec -outfile $(System.DefaultWorkingDirectory)/ReactWindows/ReactUWP.nuspec -slices ("x64.Release", "x86.Debug", "ARM.Release")
condition: and(succeeded(), ${{ parameters.packUniversal }})

- task: PowerShell@2
displayName: Strip slices from Microsoft.ReactNative.nuspec
inputs:
targetType: filePath
filePath: $(System.DefaultWorkingDirectory)\ReactWindows\StripAdditionalPlatformsFromNuspec.ps1
arguments: -nuspec $(System.DefaultWorkingDirectory)/ReactWindows/Microsoft.ReactNative.nuspec -outfile $(System.DefaultWorkingDirectory)/ReactWindows/Microsoft.ReactNative.nuspec -slices ("x64.Release", "x86.Debug", "ARM.Release")
condition: and(succeeded(), ${{ parameters.packMicrosoft }})

- task: NuGetCommand@2
displayName: 'NuGet pack Desktop'
Expand All @@ -37,6 +42,7 @@ steps:
packagesToPack: $(System.DefaultWorkingDirectory)/ReactWindows/ReactWin32.nuspec
packDestination: $(System.DefaultWorkingDirectory)/NugetRootFinal
buildProperties: CommitId=${{parameters.publishCommitId}};version=${{parameters.npmVersion}};id=${{parameters.desktopId}};nugetroot=${{parameters.nugetroot}}
condition: and(succeeded(), ${{ parameters.packDesktop }})

- task: NuGetCommand@2
displayName: 'NuGet pack Universal'
Expand All @@ -45,6 +51,7 @@ steps:
packagesToPack: $(System.DefaultWorkingDirectory)/ReactWindows/ReactUWP.nuspec
packDestination: $(System.DefaultWorkingDirectory)/NugetRootFinal
buildProperties: CommitId=${{parameters.publishCommitId}};version=${{parameters.npmVersion}};id=${{parameters.universalId}};nugetroot=${{parameters.nugetroot}}
condition: and(succeeded(), ${{ parameters.packUniversal }})

- task: NuGetCommand@2
displayName: 'NuGet pack Microsoft.ReactNative'
Expand All @@ -53,3 +60,4 @@ steps:
packagesToPack: $(System.DefaultWorkingDirectory)/ReactWindows/Microsoft.ReactNative.nuspec
packDestination: $(System.DefaultWorkingDirectory)/NugetRootFinal
buildProperties: CommitId=${{parameters.publishCommitId}};version=${{parameters.npmVersion}};id=${{parameters.microsoftRNId}};nugetroot=${{parameters.nugetroot}};baseconfiguration=Release;baseplatform=x64
condition: and(succeeded(), ${{ parameters.packMicrosoft }})
6 changes: 3 additions & 3 deletions .ado/windows-vs-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
- template: templates/build-rnw.yml
parameters:
yarnBuildCmd: build
project: vnext/ReactWindows-Universal.sln
project: vnext/Microsoft.ReactNative.sln

- task: VSTest@2
displayName: Run Universal Unit Tests
Expand All @@ -100,7 +100,6 @@ jobs:
artifactName: ReactWindows
layoutHeaders: eq('true', variables['LayoutHeaders'])
contents: |
ReactUWP\**
Microsoft.ReactNative\**

- script: |
Expand Down Expand Up @@ -603,4 +602,5 @@ jobs:

- template: templates/prep-and-pack-nuget.yml
parameters:
slices: '("x64.Release", "x86.Debug", "ARM.Debug")'
slices: '("x64.Release", "x86.Debug", "ARM.Debug")'
packUniversal: false
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "prerelease",
"comment": "Creating new Microsoft.ReactNative.sln without legacy ReactUWP",
"packageName": "react-native-windows",
"email": "jthysell@microsoft.com",
"dependentChangeType": "patch",
"date": "2020-04-09T00:12:17.073Z"
}
Loading