From 4a98024a31406944942c6fdc12bafd035a98d7a6 Mon Sep 17 00:00:00 2001 From: Nick Gerleman Date: Thu, 30 Apr 2020 00:06:43 -0700 Subject: [PATCH 1/4] Stop publishing ReactHwp NuGet Package We no longer support ReactUwp in 0.62. Stop publishing a NuGet package with it. --- .ado/publish.yml | 4 +-- .ado/templates/prep-and-pack-nuget.yml | 18 ---------- vnext/Scripts/ReactUwp.nuspec | 49 -------------------------- 3 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 vnext/Scripts/ReactUwp.nuspec diff --git a/.ado/publish.yml b/.ado/publish.yml index 249427d156a..b3240970283 100644 --- a/.ado/publish.yml +++ b/.ado/publish.yml @@ -162,9 +162,7 @@ jobs: parameters: artifactName: ReactWindows layoutHeaders: eq('true', variables['LayoutHeaders']) - contents: | - ReactUWP\** - Microsoft.ReactNative\** + contents: Microsoft.ReactNative\** # Disable for now, not sure this works on github projects anyway. # - task: PublishSymbols@2 diff --git a/.ado/templates/prep-and-pack-nuget.yml b/.ado/templates/prep-and-pack-nuget.yml index f998c54a93c..20082b54376 100644 --- a/.ado/templates/prep-and-pack-nuget.yml +++ b/.ado/templates/prep-and-pack-nuget.yml @@ -19,14 +19,6 @@ steps: downloadPath: $(System.DefaultWorkingDirectory) # Strip down the binaries from nuget because we may not have built all the flavours. - - task: PowerShell@2 - displayName: Strip slices from ReactUwp.nuspec - inputs: - 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: @@ -45,16 +37,6 @@ steps: 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' - inputs: - command: pack - verbosityPack: 'Detailed' - 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' inputs: diff --git a/vnext/Scripts/ReactUwp.nuspec b/vnext/Scripts/ReactUwp.nuspec deleted file mode 100644 index 166125d65b6..00000000000 --- a/vnext/Scripts/ReactUwp.nuspec +++ /dev/null @@ -1,49 +0,0 @@ - - - - $id$ - $version$ - Contains Windows Implementation of React-Native - Microsoft - https://github.com/microsoft/react-native-windows - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 8097dfa72f10e30c7d86f26b0546244912f576d3 Mon Sep 17 00:00:00 2001 From: Nick Gerleman Date: Thu, 30 Apr 2020 00:06:54 -0700 Subject: [PATCH 2/4] Change files --- ...ive-windows-2020-04-30-00-06-54-no-reactuwp-nuget.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 change/react-native-windows-2020-04-30-00-06-54-no-reactuwp-nuget.json diff --git a/change/react-native-windows-2020-04-30-00-06-54-no-reactuwp-nuget.json b/change/react-native-windows-2020-04-30-00-06-54-no-reactuwp-nuget.json new file mode 100644 index 00000000000..e63acbadba4 --- /dev/null +++ b/change/react-native-windows-2020-04-30-00-06-54-no-reactuwp-nuget.json @@ -0,0 +1,8 @@ +{ + "type": "none", + "comment": "Stop publishing ReactHwp NuGet Package", + "packageName": "react-native-windows", + "email": "ngerlem@microsoft.com", + "dependentChangeType": "none", + "date": "2020-04-30T07:06:54.439Z" +} From f7eb2b14f2405f84e296c119c62616919a550f3f Mon Sep 17 00:00:00 2001 From: Nick Gerleman Date: Thu, 30 Apr 2020 00:12:08 -0700 Subject: [PATCH 3/4] Remove stale variable --- .ado/templates/prep-and-pack-nuget.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.ado/templates/prep-and-pack-nuget.yml b/.ado/templates/prep-and-pack-nuget.yml index 20082b54376..698d98dcf57 100644 --- a/.ado/templates/prep-and-pack-nuget.yml +++ b/.ado/templates/prep-and-pack-nuget.yml @@ -5,7 +5,6 @@ parameters: nugetroot: $(System.DefaultWorkingDirectory)\ReactWindows desktopId: 'OfficeReact.Win32' 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 From d1dce549bd57a8b27bd754617e0b50ebc2e1f9b7 Mon Sep 17 00:00:00 2001 From: Nick Gerleman Date: Thu, 30 Apr 2020 00:14:00 -0700 Subject: [PATCH 4/4] Remove another stale var --- .ado/templates/prep-and-pack-nuget.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.ado/templates/prep-and-pack-nuget.yml b/.ado/templates/prep-and-pack-nuget.yml index 698d98dcf57..4ffbdfa76e8 100644 --- a/.ado/templates/prep-and-pack-nuget.yml +++ b/.ado/templates/prep-and-pack-nuget.yml @@ -8,7 +8,6 @@ parameters: 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