From c871348bce18eaa180b5223a3fb4343d0c923cd6 Mon Sep 17 00:00:00 2001 From: Adam Gorman Date: Mon, 9 Mar 2020 15:16:15 -0700 Subject: [PATCH 1/4] Release is Bundle by default, thus BundleCommand should do Release type things. --- .../windows/SampleAppCPP/SampleAppCpp.vcxproj | 2 +- .../windows/SampleAppCS/SampleAppCS.csproj | 2 +- .../generator-windows/templates/cpp/proj/MyApp.vcxproj | 2 +- .../local-cli/generator-windows/templates/cs/proj/MyApp.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj index 37891ebedd2..f10e8cd0a53 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj @@ -176,7 +176,7 @@ cd $(SolutionDir).. - npx --no-install react-native bundle --platform windows --entry-file index.windows.js --bundle-output windows/SampleAppCpp/Bundle/index.windows.bundle --assets-dest windows/SampleAppCpp/Bundle + npx --no-install react-native bundle --platform windows --entry-file index.windows.js --dev false --bundle-output windows/SampleAppCpp/Bundle/index.windows.bundle --assets-dest windows/SampleAppCpp/Bundle diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj index 7206c91b488..ab088561512 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj @@ -176,7 +176,7 @@ cd $(SolutionDir).. - npx --no-install react-native bundle --platform windows --entry-file index.windows.js --bundle-output windows/SampleAppCS/Bundle/index.windows.bundle --assets-dest windows/SampleAppCS/Bundle + npx --no-install react-native bundle --platform windows --entry-file index.windows.js --dev false --bundle-output windows/SampleAppCS/Bundle/index.windows.bundle --assets-dest windows/SampleAppCS/Bundle diff --git a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj index de7e6f84a66..1eb6aff1b09 100644 --- a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj +++ b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj @@ -160,7 +160,7 @@ cd $(SolutionDir).. - npx --no-install react-native bundle --platform windows --entry-file index.js --bundle-output windows/$(SolutionName)/Bundle/index.windows.bundle --assets-dest windows/$(SolutionName)/Bundle + npx --no-install react-native bundle --platform windows --entry-file index.js --dev false --bundle-output windows/$(SolutionName)/Bundle/index.windows.bundle --assets-dest windows/$(SolutionName)/Bundle diff --git a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj index aebcefd3b2e..547f645ab53 100644 --- a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj +++ b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj @@ -170,7 +170,7 @@ cd $(SolutionDir).. - npx --no-install react-native bundle --platform windows --entry-file index.js --bundle-output windows/$(SolutionName)/Bundle/index.windows.bundle --assets-dest windows/$(SolutionName)/Bundle + npx --no-install react-native bundle --platform windows --entry-file index.js --dev false --bundle-output windows/$(SolutionName)/Bundle/index.windows.bundle --assets-dest windows/$(SolutionName)/Bundle From 385542d9ea5e6ad4662bd77606372b5dba3cd327 Mon Sep 17 00:00:00 2001 From: Adam Gorman Date: Mon, 9 Mar 2020 15:18:29 -0700 Subject: [PATCH 2/4] Change files --- .../react-native-windows-2020-03-09-15-18-29-master.json | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 change/react-native-windows-2020-03-09-15-18-29-master.json diff --git a/change/react-native-windows-2020-03-09-15-18-29-master.json b/change/react-native-windows-2020-03-09-15-18-29-master.json new file mode 100644 index 00000000000..b964ae969ee --- /dev/null +++ b/change/react-native-windows-2020-03-09-15-18-29-master.json @@ -0,0 +1,9 @@ +{ + "type": "prerelease", + "comment": "Release is Bundle by default, thus BundleCommand should do Release type things.", + "packageName": "react-native-windows", + "email": "adamgor@microsoft.com", + "commit": "c871348bce18eaa180b5223a3fb4343d0c923cd6", + "dependentChangeType": "patch", + "date": "2020-03-09T22:18:28.823Z" +} \ No newline at end of file From 71b6856b4fb2171aaa27452085a892b4bc2511fa Mon Sep 17 00:00:00 2001 From: Adam Gorman Date: Mon, 9 Mar 2020 15:28:57 -0700 Subject: [PATCH 3/4] Release is Bundle by default, thus BundleCommand should do Release type things. --- .../windows/SampleAppCPP/SampleAppCpp.vcxproj | 8 +++++++- .../windows/SampleAppCS/SampleAppCS.csproj | 8 +++++++- .../generator-windows/templates/cpp/proj/MyApp.vcxproj | 8 +++++++- .../generator-windows/templates/cs/proj/MyApp.csproj | 8 +++++++- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj index f10e8cd0a53..7cc2d24d16a 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj @@ -63,6 +63,12 @@ true false + + true + + + false + @@ -176,7 +182,7 @@ cd $(SolutionDir).. - npx --no-install react-native bundle --platform windows --entry-file index.windows.js --dev false --bundle-output windows/SampleAppCpp/Bundle/index.windows.bundle --assets-dest windows/SampleAppCpp/Bundle + npx --no-install react-native bundle --platform windows --entry-file index.windows.js --dev $(devEnabled) --bundle-output windows/SampleAppCpp/Bundle/index.windows.bundle --assets-dest windows/SampleAppCpp/Bundle diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj index ab088561512..99b4f77510a 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj @@ -113,6 +113,12 @@ true true + + true + + + false + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ @@ -176,7 +182,7 @@ cd $(SolutionDir).. - npx --no-install react-native bundle --platform windows --entry-file index.windows.js --dev false --bundle-output windows/SampleAppCS/Bundle/index.windows.bundle --assets-dest windows/SampleAppCS/Bundle + npx --no-install react-native bundle --platform windows --entry-file index.windows.js --dev $(devEnabled) --bundle-output windows/SampleAppCS/Bundle/index.windows.bundle --assets-dest windows/SampleAppCS/Bundle diff --git a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj index 1eb6aff1b09..d4d46566e22 100644 --- a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj +++ b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj @@ -54,6 +54,12 @@ x64 + + true + + + false + Application $(DefaultPlatformToolset) @@ -160,7 +166,7 @@ cd $(SolutionDir).. - npx --no-install react-native bundle --platform windows --entry-file index.js --dev false --bundle-output windows/$(SolutionName)/Bundle/index.windows.bundle --assets-dest windows/$(SolutionName)/Bundle + npx --no-install react-native bundle --platform windows --entry-file index.js --dev $(devEnabled) --bundle-output windows/$(SolutionName)/Bundle/index.windows.bundle --assets-dest windows/$(SolutionName)/Bundle diff --git a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj index 547f645ab53..6c40ba31bf5 100644 --- a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj +++ b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj @@ -116,6 +116,12 @@ true true + + true + + + false + PackageReference @@ -170,7 +176,7 @@ cd $(SolutionDir).. - npx --no-install react-native bundle --platform windows --entry-file index.js --dev false --bundle-output windows/$(SolutionName)/Bundle/index.windows.bundle --assets-dest windows/$(SolutionName)/Bundle + npx --no-install react-native bundle --platform windows --entry-file index.js --dev $(devEnabled) --bundle-output windows/$(SolutionName)/Bundle/index.windows.bundle --assets-dest windows/$(SolutionName)/Bundle From 6a01b911d48f97de2a707d330c458472dd17fb4a Mon Sep 17 00:00:00 2001 From: Adam Gorman Date: Mon, 9 Mar 2020 18:08:07 -0700 Subject: [PATCH 4/4] update name to ReactNativeBundleDevMode --- .../windows/SampleAppCPP/SampleAppCpp.vcxproj | 6 +++--- .../windows/SampleAppCS/SampleAppCS.csproj | 6 +++--- .../generator-windows/templates/cpp/proj/MyApp.vcxproj | 6 +++--- .../generator-windows/templates/cs/proj/MyApp.csproj | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj index 7cc2d24d16a..7ed61040ea4 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj @@ -64,10 +64,10 @@ false - true + true - false + false @@ -182,7 +182,7 @@ cd $(SolutionDir).. - npx --no-install react-native bundle --platform windows --entry-file index.windows.js --dev $(devEnabled) --bundle-output windows/SampleAppCpp/Bundle/index.windows.bundle --assets-dest windows/SampleAppCpp/Bundle + npx --no-install react-native bundle --platform windows --entry-file index.windows.js --dev $(ReactNativeBundleDevMode) --bundle-output windows/SampleAppCpp/Bundle/index.windows.bundle --assets-dest windows/SampleAppCpp/Bundle diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj index 99b4f77510a..4b178520794 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj @@ -114,10 +114,10 @@ true - true + true - false + false $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ @@ -182,7 +182,7 @@ cd $(SolutionDir).. - npx --no-install react-native bundle --platform windows --entry-file index.windows.js --dev $(devEnabled) --bundle-output windows/SampleAppCS/Bundle/index.windows.bundle --assets-dest windows/SampleAppCS/Bundle + npx --no-install react-native bundle --platform windows --entry-file index.windows.js --dev $(ReactNativeBundleDevMode) --bundle-output windows/SampleAppCS/Bundle/index.windows.bundle --assets-dest windows/SampleAppCS/Bundle diff --git a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj index d4d46566e22..44685da54ad 100644 --- a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj +++ b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj @@ -55,10 +55,10 @@ - true + true - false + false Application @@ -166,7 +166,7 @@ cd $(SolutionDir).. - npx --no-install react-native bundle --platform windows --entry-file index.js --dev $(devEnabled) --bundle-output windows/$(SolutionName)/Bundle/index.windows.bundle --assets-dest windows/$(SolutionName)/Bundle + npx --no-install react-native bundle --platform windows --entry-file index.js --dev $(ReactNativeBundleDevMode) --bundle-output windows/$(SolutionName)/Bundle/index.windows.bundle --assets-dest windows/$(SolutionName)/Bundle diff --git a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj index 6c40ba31bf5..9208646ad14 100644 --- a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj +++ b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj @@ -117,10 +117,10 @@ true - true + true - false + false PackageReference @@ -176,7 +176,7 @@ cd $(SolutionDir).. - npx --no-install react-native bundle --platform windows --entry-file index.js --dev $(devEnabled) --bundle-output windows/$(SolutionName)/Bundle/index.windows.bundle --assets-dest windows/$(SolutionName)/Bundle + npx --no-install react-native bundle --platform windows --entry-file index.js --dev $(ReactNativeBundleDevMode) --bundle-output windows/$(SolutionName)/Bundle/index.windows.bundle --assets-dest windows/$(SolutionName)/Bundle