Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 9b0e2d5

Browse files
jcansdalejcansdale
authored
Merge pull request #1314 from github/fixes/what-about-them-pkgdefs
 Fix packaging of startpage and inlinereviews vsix's
2 parents 7a64b1f + ea69dff commit 9b0e2d5

File tree

4 files changed

+9
-65
lines changed

4 files changed

+9
-65
lines changed

‎src/GitHub.InlineReviews/GitHub.InlineReviews.csproj‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
<CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>
3333
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
3434
<CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
35+
<CreateVsixContainer>False</CreateVsixContainer>
36+
<DeployExtension>False</DeployExtension>
3537
</PropertyGroup>
3638
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3739
<DebugSymbols>true</DebugSymbols>
@@ -41,9 +43,6 @@
4143
<ErrorReport>prompt</ErrorReport>
4244
<WarningLevel>4</WarningLevel>
4345
<RunCodeAnalysis>false</RunCodeAnalysis>
44-
<CreateVsixContainer>True</CreateVsixContainer>
45-
<DeployExtension>True</DeployExtension>
46-
<IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
4746
<OutputPath>bin\Debug\</OutputPath>
4847
</PropertyGroup>
4948
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugCodeAnalysis|AnyCPU'">
@@ -54,20 +53,6 @@
5453
<ErrorReport>prompt</ErrorReport>
5554
<WarningLevel>4</WarningLevel>
5655
<RunCodeAnalysis>true</RunCodeAnalysis>
57-
<CreateVsixContainer>True</CreateVsixContainer>
58-
<DeployExtension>True</DeployExtension>
59-
<OutputPath>bin\Debug\</OutputPath>
60-
</PropertyGroup>
61-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWithoutVsix|AnyCPU' ">
62-
<DebugSymbols>true</DebugSymbols>
63-
<DebugType>full</DebugType>
64-
<Optimize>false</Optimize>
65-
<DefineConstants>TRACE;DEBUG;CODE_ANALYSIS</DefineConstants>
66-
<ErrorReport>prompt</ErrorReport>
67-
<WarningLevel>4</WarningLevel>
68-
<RunCodeAnalysis>false</RunCodeAnalysis>
69-
<CreateVsixContainer>False</CreateVsixContainer>
70-
<DeployExtension>False</DeployExtension>
7156
<OutputPath>bin\Debug\</OutputPath>
7257
</PropertyGroup>
7358
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -77,19 +62,6 @@
7762
<ErrorReport>prompt</ErrorReport>
7863
<WarningLevel>4</WarningLevel>
7964
<RunCodeAnalysis>true</RunCodeAnalysis>
80-
<CreateVsixContainer>True</CreateVsixContainer>
81-
<DeployExtension>True</DeployExtension>
82-
<OutputPath>bin\Release\</OutputPath>
83-
</PropertyGroup>
84-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWithoutVsix|AnyCPU' ">
85-
<DebugType>pdbonly</DebugType>
86-
<Optimize>true</Optimize>
87-
<DefineConstants>TRACE</DefineConstants>
88-
<ErrorReport>prompt</ErrorReport>
89-
<WarningLevel>4</WarningLevel>
90-
<RunCodeAnalysis>true</RunCodeAnalysis>
91-
<CreateVsixContainer>False</CreateVsixContainer>
92-
<DeployExtension>False</DeployExtension>
9365
<OutputPath>bin\Release\</OutputPath>
9466
</PropertyGroup>
9567
<Import Project="$(SolutionDir)\src\common\signing.props" />

‎src/GitHub.InlineReviews/source.extension.vsixmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
33
<Metadata>
4-
<Identity Id="GitHub.InlineReviews.Steven Kirk.56b6fdce-e5b1-4ec3-9837-af4545ba933e" Version="1.0" Language="en-US" Publisher="Steven Kirk" />
4+
<Identity Id="GitHub.InlineReviews.56b6fdce-e5b1-4ec3-9837-af4545ba933e" Version="2.0" Language="en-US" Publisher="GitHub, Inc" />
55
<DisplayName>GitHub Inline Reviews</DisplayName>
66
<Description xml:space="preserve">Inline reviews for GitHub pull requests</Description>
77
</Metadata>

‎src/GitHub.StartPage/GitHub.StartPage.csproj‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
<CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>
3131
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
3232
<CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
33+
<CreateVsixContainer>False</CreateVsixContainer>
34+
<DeployExtension>False</DeployExtension>
3335
</PropertyGroup>
3436
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3537
<DebugSymbols>true</DebugSymbols>
@@ -39,9 +41,6 @@
3941
<ErrorReport>prompt</ErrorReport>
4042
<WarningLevel>4</WarningLevel>
4143
<RunCodeAnalysis>false</RunCodeAnalysis>
42-
<CreateVsixContainer>True</CreateVsixContainer>
43-
<DeployExtension>True</DeployExtension>
44-
<IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
4544
<OutputPath>bin\Debug\</OutputPath>
4645
</PropertyGroup>
4746
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugCodeAnalysis|AnyCPU'">
@@ -52,20 +51,6 @@
5251
<ErrorReport>prompt</ErrorReport>
5352
<WarningLevel>4</WarningLevel>
5453
<RunCodeAnalysis>true</RunCodeAnalysis>
55-
<CreateVsixContainer>True</CreateVsixContainer>
56-
<DeployExtension>True</DeployExtension>
57-
<OutputPath>bin\Debug\</OutputPath>
58-
</PropertyGroup>
59-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWithoutVsix|AnyCPU' ">
60-
<DebugSymbols>true</DebugSymbols>
61-
<DebugType>full</DebugType>
62-
<Optimize>false</Optimize>
63-
<DefineConstants>TRACE;DEBUG;CODE_ANALYSIS</DefineConstants>
64-
<ErrorReport>prompt</ErrorReport>
65-
<WarningLevel>4</WarningLevel>
66-
<RunCodeAnalysis>false</RunCodeAnalysis>
67-
<CreateVsixContainer>False</CreateVsixContainer>
68-
<DeployExtension>False</DeployExtension>
6954
<OutputPath>bin\Debug\</OutputPath>
7055
</PropertyGroup>
7156
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -75,19 +60,6 @@
7560
<ErrorReport>prompt</ErrorReport>
7661
<WarningLevel>4</WarningLevel>
7762
<RunCodeAnalysis>true</RunCodeAnalysis>
78-
<CreateVsixContainer>True</CreateVsixContainer>
79-
<DeployExtension>True</DeployExtension>
80-
<OutputPath>bin\Release\</OutputPath>
81-
</PropertyGroup>
82-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWithoutVsix|AnyCPU' ">
83-
<DebugType>pdbonly</DebugType>
84-
<Optimize>true</Optimize>
85-
<DefineConstants>TRACE</DefineConstants>
86-
<ErrorReport>prompt</ErrorReport>
87-
<WarningLevel>4</WarningLevel>
88-
<RunCodeAnalysis>true</RunCodeAnalysis>
89-
<CreateVsixContainer>False</CreateVsixContainer>
90-
<DeployExtension>False</DeployExtension>
9163
<OutputPath>bin\Release\</OutputPath>
9264
</PropertyGroup>
9365
<ItemGroup>

‎src/GitHub.VisualStudio/GitHub.VisualStudio.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -660,15 +660,15 @@
660660
<Project>{7f5ed78b-74a3-4406-a299-70cfb5885b8b}</Project>
661661
<Name>GitHub.InlineReviews</Name>
662662
<Private>True</Private>
663-
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIX>
664-
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIXLocalOnly>
663+
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;PkgdefProjectOutputGroup</IncludeOutputGroupsInVSIX>
664+
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup;PkgdefProjectOutputGroup</IncludeOutputGroupsInVSIXLocalOnly>
665665
</ProjectReference>
666666
<ProjectReference Include="..\GitHub.StartPage\GitHub.StartPage.csproj">
667667
<Project>{50e277b8-8580-487a-8f8e-5c3b9fbf0f77}</Project>
668668
<Name>GitHub.StartPage</Name>
669669
<Private>True</Private>
670-
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIX>
671-
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIXLocalOnly>
670+
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;PkgdefProjectOutputGroup</IncludeOutputGroupsInVSIX>
671+
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup;PkgdefProjectOutputGroup</IncludeOutputGroupsInVSIXLocalOnly>
672672
</ProjectReference>
673673
<ProjectReference Include="..\GitHub.TeamFoundation.14\GitHub.TeamFoundation.14.csproj">
674674
<Project>{161dbf01-1dbf-4b00-8551-c5c00f26720d}</Project>

0 commit comments

Comments
 (0)