Skip to content

Commit c60ab2c

Browse files
committed
fix(windows): remove the self-signed test certificate
It's not needed for local development and is just a pain to maintain.
1 parent 7e6a2f9 commit c60ab2c

File tree

9 files changed

+32
-48
lines changed

9 files changed

+32
-48
lines changed

.github/actions/setup-toolchain/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ runs:
1818
java-version: 11
1919
- name: Set up MSBuild
2020
if: ${{ inputs.platform == 'windows' }}
21-
uses: microsoft/setup-msbuild@v1.0.3
21+
uses: microsoft/setup-msbuild@v1.1
2222
- name: Set up Ruby
2323
if: ${{ inputs.platform == 'ios' || inputs.platform == 'macos' }}
2424
uses: ruby/[email protected]

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -362,12 +362,12 @@ jobs:
362362
working-directory: example/windows
363363
- name: Build
364364
run: |
365-
MSBuild Example.sln -t:Rebuild -p:Configuration=${{ matrix.configuration }} -p:Platform=${{ matrix.platform }}
365+
../../scripts/MSBuild.ps1 -Configuration ${{ matrix.configuration }} -Platform ${{ matrix.platform }} Example.sln
366366
working-directory: example/windows
367367
- name: Test
368368
if: ${{ matrix.platform == 'x64' }}
369369
run: |
370-
MSBuild ReactTestAppTests.vcxproj -t:Build -p:Configuration=${{ matrix.configuration }} -p:Platform=${{ matrix.platform }}
370+
../../../scripts/MSBuild.ps1 -Configuration ${{ matrix.configuration }} -Platform ${{ matrix.platform }} -Target Build ReactTestAppTests.vcxproj
371371
VSTest.Console.exe ${{ matrix.platform }}\${{ matrix.configuration }}\ReactTestAppTests.dll
372372
working-directory: example/windows/ReactTestAppTests
373373
windows-template:
@@ -401,8 +401,8 @@ jobs:
401401
working-directory: template-example
402402
- name: Build
403403
run: |
404-
if ("${{ matrix.template }}" -eq "all") { MSBuild windows/TemplateExample.sln -t:Rebuild -p:Platform=x64 }
405-
else { MSBuild TemplateExample.sln -t:Rebuild -p:Platform=x64 }
404+
if ("${{ matrix.template }}" -eq "all") { ../scripts/MSBuild.ps1 windows/TemplateExample.sln }
405+
else { ../scripts/MSBuild.ps1 TemplateExample.sln }
406406
working-directory: template-example
407407
release:
408408
needs:

.github/workflows/renew-windows-certificate.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

scripts/MSBuild.ps1

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
param(
2+
[Parameter(Mandatory, Position=0)]
3+
[String]
4+
$ProjectFile,
5+
6+
[String]
7+
$Configuration="Debug",
8+
9+
[String]
10+
$Platform="x64",
11+
12+
[String]
13+
$Target="Rebuild",
14+
15+
[Switch]
16+
$UseBundle=$false
17+
)
18+
19+
MSBuild `
20+
-maxCpuCount `
21+
-property:Configuration=$Configuration `
22+
-property:Platform=$Platform `
23+
-property:AppxPackageSigningEnabled=false `
24+
-property:UseBundle=($UseBundle.ToString().ToLower()) `
25+
-target:$Target `
26+
$ProjectFile

test/windows-test-app/copyAndReplace.test.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,13 @@ describe("copyAndReplace", () => {
2020

2121
test("replaces text files only", async () => {
2222
mockFiles({
23-
"ReactTestApp_TemporaryKey.pfx": "binary",
2423
"ReactTestApp.png": "binary",
2524
"ReactTestApp.sln": "binary",
2625
"test/.placeholder": "",
2726
});
2827

2928
const replacements = { binary: "text" };
3029

31-
await copyAndReplaceAsync(
32-
"ReactTestApp_TemporaryKey.pfx",
33-
"test/ReactTestApp_TemporaryKey.pfx",
34-
replacements
35-
);
36-
expect(
37-
fs.readFileSync("test/ReactTestApp_TemporaryKey.pfx", {
38-
encoding: "utf8",
39-
})
40-
).toBe("binary");
41-
4230
await copyAndReplaceAsync(
4331
"ReactTestApp.png",
4432
"test/ReactTestApp.png",

windows/ReactTestApp/ReactTestApp.vcxproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
1818
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.19041.0</WindowsTargetPlatformVersion>
1919
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
20-
<PackageCertificateKeyFile>ReactTestApp_TemporaryKey.pfx</PackageCertificateKeyFile>
21-
<PackageCertificateThumbprint>CF5E09A17EC338910A836B9975B2E95912A8D8F1</PackageCertificateThumbprint>
2220
</PropertyGroup>
2321
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2422
<PropertyGroup Label="ReactNativeWindowsProps">
@@ -180,9 +178,6 @@
180178
<Text Include="$(ProjectRootDir)\app.json" />
181179
<!-- ReactTestApp asset items -->
182180
</ItemGroup>
183-
<ItemGroup>
184-
<None Include="ReactTestApp_TemporaryKey.pfx" />
185-
</ItemGroup>
186181
<ItemGroup>
187182
<ClCompile Include="$(ReactTestAppDir)\pch.cpp">
188183
<PrecompiledHeader>Create</PrecompiledHeader>

windows/ReactTestApp/ReactTestApp.vcxproj.filters

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,5 @@
6969
<ItemGroup>
7070
<None Include="PropertySheet.props" />
7171
<None Include="packages.config" />
72-
<None Include="ReactTestApp_TemporaryKey.pfx" />
7372
</ItemGroup>
7473
</Project>
-2.48 KB
Binary file not shown.

windows/test-app.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const templateView = {
4444
const uniqueFilterIdentifier = "e48dc53e-40b1-40cb-970a-f89935452892";
4545

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

4949
/** @type {{ recursive: true, mode: 0o755 }} */
5050
const mkdirRecursiveOptions = { recursive: true, mode: 0o755 };
@@ -546,7 +546,6 @@ function generateSolution(destPath, { autolink, useHermes, useNuGet }) {
546546
"PropertySheet.props",
547547
"ReactTestApp.vcxproj",
548548
"ReactTestApp.vcxproj.filters",
549-
"ReactTestApp_TemporaryKey.pfx",
550549
"packages.config",
551550
].map((file) =>
552551
copyAndReplace(

0 commit comments

Comments
 (0)