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.

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

Add support for non-SNI SSL certificate in WixToolset.Http #442

Closed
Closed
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
6 changes: 5 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,14 @@ on:
branches:
- master
- develop
- develop-v4.0.1
- develop402
pull_request:
branches:
- master
- develop
- develop-v4.0.1
- develop402
workflow_dispatch:
inputs:
tags:
Expand Down Expand Up @@ -88,5 +92,5 @@ jobs:
path: build/logs/

- name: Push to GitHub Packages
if: github.event_name == 'push' && github.repository_owner == 'wixtoolset' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop')
if: github.event_name == 'push' && github.repository_owner == 'wixtoolset' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/develop-v4.0.1' || github.ref == 'refs/heads/develop402')
run: dotnet nuget push "build/artifacts/**/*.nupkg" --source https://nuget.pkg.github.com/wixtoolset/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
4 changes: 3 additions & 1 deletion src/dtf/SfxCA/SfxCA.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@
</ItemGroup>

<ItemGroup>
<ResourceCompile Include="SfxCA.rc" />
<ResourceCompile Include="SfxCA.rc">
<Culture>0x0409</Culture>
</ResourceCompile>
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 5 additions & 0 deletions src/ext/Http/ca/CustomMsiErrors.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#pragma once
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

#define msierrCERTFailedOpen 26351
#define msierrCERTFailedAdd 26352
Loading