Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update samples to 0.74 #937

Merged
merged 9 commits into from
May 31, 2024
Merged

Update samples to 0.74 #937

merged 9 commits into from
May 31, 2024

Conversation

Yajur-Grover
Copy link
Contributor

@Yajur-Grover Yajur-Grover commented May 2, 2024 •
edited
Loading

Description

Upgrade Calculator, CalculatorNuget and NativeModule samples to 0.74 as part of 0.74 release.

Why

Part of microsoft/react-native-windows#12874

Screenshots

N/A

Microsoft Reviewers: Open in CodeFlow

@Yajur-Grover Yajur-Grover requested a review from a team as a code owner May 2, 2024 17:25
chrisglein
chrisglein requested changes May 2, 2024
View reviewed changes
samples/Calculator/csharp/package.json Outdated
@@ -12,17 +12,17 @@
},
"dependencies": {
"react": "18.2.0",
"react-native": "0.73.0",
"react-native-windows": "0.73.2"
"react-native": "0.74.0-rc.9",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"react-native": "0.74.0-rc.9",
"react-native": "0.74.0",

Assuming @TatianaKapos validated that this works fine.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thought I reverted them all - will fix!

samples/Calculator/csharp/windows/calculator/Package.appxmanifest Outdated

<Properties>
<DisplayName>Calculator</DisplayName>
<PublisherDisplayName>CN=React Native Windows Sample</PublisherDisplayName>
<PublisherDisplayName>yajurgrover</PublisherDisplayName>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert

Suggested change
<PublisherDisplayName>yajurgrover</PublisherDisplayName>
<PublisherDisplayName>CN=React Native Windows Sample</PublisherDisplayName>

samples/Calculator/csharp/windows/calculator/Package.appxmanifest Outdated
Comment on lines 10 to 14
Name="7657a35a-6073-4280-b14b-409220cbd347"
Publisher="CN=React Native Windows Sample"
Version="1.0.0.0" />

<mp:PhoneIdentity PhoneProductId="b3e4af42-aec3-46e8-a138-cb2e481514b2" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
<mp:PhoneIdentity PhoneProductId="7657a35a-6073-4280-b14b-409220cbd347" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally the package identity is stable across updates. If you create from a fresh app template you'll need to copy the project and package ids back over.

samples/Calculator/csharp/windows/calculator/calculator.csproj Outdated
<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="$(SolutionDir)\ExperimentalFeatures.props" Condition="Exists('$(SolutionDir)\ExperimentalFeatures.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProjectGuid>{7410B9FC-308E-4496-B556-FC56F1910AA7}</ProjectGuid>
<ProjectGuid>{B2ABB10D-1A83-4DF1-8D0C-7167F3F88A5F}</ProjectGuid>
Copy link
Member

@chrisglein chrisglein May 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should be able to do a find replace to put back the old project guid.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI the project guid is just a Visual Studio thing. But it should be able to be left unchanged.
The one in the package manifest is what actually determines the store listing. So changing that is more disruptive.

samples/CalculatorNuGet/windows/calculatornuget/Package.appxmanifest Outdated
Comment on lines 9 to 18
<Identity
Name="b36753c3-2e37-4dd8-8d3d-66953d899343"
Name="bad696f0-699e-47a2-87df-2877b64a81a6"
Publisher="CN=React Native Windows Sample"
Version="1.0.0.0" />

<mp:PhoneIdentity PhoneProductId="b36753c3-2e37-4dd8-8d3d-66953d899343" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
<mp:PhoneIdentity PhoneProductId="bad696f0-699e-47a2-87df-2877b64a81a6" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>

<Properties>
<DisplayName>CalculatorNuGet</DisplayName>
<PublisherDisplayName>CN=React Native Windows Sample</PublisherDisplayName>
<PublisherDisplayName>yajurgrover</PublisherDisplayName>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As with other project, leave the package and project information intact.

Yajur-Grover
Yajur-Grover commented May 2, 2024
View reviewed changes
samples/NativeModuleSample/csharp/windows/NativeModuleSample/packages.lock.json
Comment on lines -142 to +145
"type": "Project"
"type": "Project",
"dependencies": {
"boost": "[1.76.0, )"
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure about this change - didn't create any issues when building the sample but wanted to confirm if this should be kept.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May just be from a package dependency, if it didn't break the project it's fine to keep :)

@Yajur-Grover Yajur-Grover changed the title Update Calculator and CalculatorNuget samples to 0.74 Update samples to 0.74 May 2, 2024
TatianaKapos
TatianaKapos reviewed May 2, 2024
View reviewed changes
samples/Calculator/cppwinrt/README.md
@@ -4,7 +4,7 @@ See [../README.md](../README.md) for details of this sample.

See [../csharp/](../csharp/) for a C# version of this sample.

It currently targets React Native Windows 0.73.
It currently targets React Native Windows 0.74.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also update the ReadMe in the parent folder? (also maybe add that to the ReadMe upgrade instructions, I also always forgot to update that one!)

@chrisglein chrisglein mentioned this pull request May 9, 2024
Merged
@Yajur-Grover Yajur-Grover merged commit e78fb10 into microsoft:main May 31, 2024
29 checks passed
@Yajur-Grover Yajur-Grover linked an issue May 31, 2024 that may be closed by this pull request
Update samples to 0.74.x #943
Closed
@Yajur-Grover Yajur-Grover mentioned this pull request May 31, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chiaramooney chiaramooney chiaramooney approved these changes

@TatianaKapos TatianaKapos TatianaKapos approved these changes

@chrisglein chrisglein Awaiting requested review from chrisglein

Assignees

@chiaramooney chiaramooney

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update samples to 0.74.x
4 participants
@Yajur-Grover @chrisglein @chiaramooney @TatianaKapos