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
2 changes: 1 addition & 1 deletion .github/actions/setup-toolchain/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ runs:
java-version: 11
- name: Set up MSBuild
if: ${{ inputs.platform == 'windows' }}
uses: microsoft/setup-msbuild@v1.0.3
uses: microsoft/setup-msbuild@v1.1
- name: Set up Ruby
if: ${{ inputs.platform == 'ios' || inputs.platform == 'macos' }}
uses: ruby/[email protected]
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -362,12 +362,12 @@ jobs:
working-directory: example/windows
- name: Build
run: |
MSBuild Example.sln -t:Rebuild -p:Configuration=${{ matrix.configuration }} -p:Platform=${{ matrix.platform }}
../../scripts/MSBuild.ps1 -Configuration ${{ matrix.configuration }} -Platform ${{ matrix.platform }} Example.sln
working-directory: example/windows
- name: Test
if: ${{ matrix.platform == 'x64' }}
run: |
MSBuild ReactTestAppTests.vcxproj -t:Build -p:Configuration=${{ matrix.configuration }} -p:Platform=${{ matrix.platform }}
../../../scripts/MSBuild.ps1 -Configuration ${{ matrix.configuration }} -Platform ${{ matrix.platform }} -Target Build ReactTestAppTests.vcxproj
VSTest.Console.exe ${{ matrix.platform }}\${{ matrix.configuration }}\ReactTestAppTests.dll
working-directory: example/windows/ReactTestAppTests
windows-template:
Expand Down Expand Up @@ -401,8 +401,8 @@ jobs:
working-directory: template-example
- name: Build
run: |
if ("${{ matrix.template }}" -eq "all") { MSBuild windows/TemplateExample.sln -t:Rebuild -p:Platform=x64 }
else { MSBuild TemplateExample.sln -t:Rebuild -p:Platform=x64 }
if ("${{ matrix.template }}" -eq "all") { ../scripts/MSBuild.ps1 windows/TemplateExample.sln }
else { ../scripts/MSBuild.ps1 TemplateExample.sln }
working-directory: template-example
release:
needs:
Expand Down
23 changes: 0 additions & 23 deletions .github/workflows/renew-windows-certificate.yml

This file was deleted.

23 changes: 23 additions & 0 deletions scripts/MSBuild.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
param(
[Parameter(Mandatory, Position=0)]
[String]
$ProjectFile,

[String]
$Configuration="Debug",

[String]
$Platform="x64",

[String]
$Target="Rebuild"
)

MSBuild `
-maxCpuCount `
-property:Configuration=$Configuration `
-property:Platform=$Platform `
-property:AppxPackageSigningEnabled=false `
-property:UseBundle=false `
-target:$Target `
$ProjectFile
12 changes: 0 additions & 12 deletions test/windows-test-app/copyAndReplace.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,13 @@ describe("copyAndReplace", () => {

test("replaces text files only", async () => {
mockFiles({
"ReactTestApp_TemporaryKey.pfx": "binary",
"ReactTestApp.png": "binary",
"ReactTestApp.sln": "binary",
"test/.placeholder": "",
});

const replacements = { binary: "text" };

await copyAndReplaceAsync(
"ReactTestApp_TemporaryKey.pfx",
"test/ReactTestApp_TemporaryKey.pfx",
replacements
);
expect(
fs.readFileSync("test/ReactTestApp_TemporaryKey.pfx", {
encoding: "utf8",
})
).toBe("binary");

await copyAndReplaceAsync(
"ReactTestApp.png",
"test/ReactTestApp.png",
Expand Down
5 changes: 0 additions & 5 deletions windows/ReactTestApp/ReactTestApp.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.19041.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
<PackageCertificateKeyFile>ReactTestApp_TemporaryKey.pfx</PackageCertificateKeyFile>
<PackageCertificateThumbprint>CF5E09A17EC338910A836B9975B2E95912A8D8F1</PackageCertificateThumbprint>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="ReactNativeWindowsProps">
Expand Down Expand Up @@ -180,9 +178,6 @@
<Text Include="$(ProjectRootDir)\app.json" />
<!-- ReactTestApp asset items -->
</ItemGroup>
<ItemGroup>
<None Include="ReactTestApp_TemporaryKey.pfx" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(ReactTestAppDir)\pch.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
Expand Down
1 change: 0 additions & 1 deletion windows/ReactTestApp/ReactTestApp.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,5 @@
<ItemGroup>
<None Include="PropertySheet.props" />
<None Include="packages.config" />
<None Include="ReactTestApp_TemporaryKey.pfx" />
</ItemGroup>
</Project>
Binary file removed windows/ReactTestApp/ReactTestApp_TemporaryKey.pfx
Binary file not shown.
3 changes: 1 addition & 2 deletions windows/test-app.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const templateView = {
const uniqueFilterIdentifier = "e48dc53e-40b1-40cb-970a-f89935452892";

// Binary files in React Native Test App Windows project
const binaryExtensions = [".png", ".pfx"];
const binaryExtensions = [".png"];

/** @type {{ recursive: true, mode: 0o755 }} */
const mkdirRecursiveOptions = { recursive: true, mode: 0o755 };
Expand Down Expand Up @@ -546,7 +546,6 @@ function generateSolution(destPath, { autolink, useHermes, useNuGet }) {
"PropertySheet.props",
"ReactTestApp.vcxproj",
"ReactTestApp.vcxproj.filters",
"ReactTestApp_TemporaryKey.pfx",
"packages.config",
].map((file) =>
copyAndReplace(
Expand Down