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

Commit 1a0456d

Browse files
committed
Update GitHub.TeamFoundation.16 to target .NET 4.7.2
This project needs to compile against assemblies that target .NET 4.7.2. Because GitHub.VisualStudio targets .NET 4.6, it can no longer compile against GitHub.TeamFoundation.16. We now include GitHub.TeamFoundation.16.dll as content in GitHub.VisualStudio and change the MefComponent Asset to use a File rather than Project Source.
1 parent d46bd0d commit 1a0456d

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

src/GitHub.TeamFoundation.16/GitHub.TeamFoundation.16.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<RootNamespace>GitHub.TeamFoundation</RootNamespace>
1313
<AssemblyName>GitHub.TeamFoundation.16</AssemblyName>
1414
<LangVersion>7.3</LangVersion>
15-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
15+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1616
<FileAlignment>512</FileAlignment>
1717
<CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
1818
<NuGetPackageImportStamp>

src/GitHub.VisualStudio/GitHub.VisualStudio.csproj

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,11 @@
166166
</EmbeddedResource>
167167
</ItemGroup>
168168
<ItemGroup>
169+
<Content Include="..\GitHub.TeamFoundation.16\obj\$(Configuration)\GitHub.TeamFoundation.16.dll">
170+
<Link>GitHub.TeamFoundation.16.dll</Link>
171+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
172+
<IncludeInVSIX>true</IncludeInVSIX>
173+
</Content>
169174
<Content Include="Resources\logo_128x128.png">
170175
<IncludeInVSIX>true</IncludeInVSIX>
171176
</Content>
@@ -183,9 +188,6 @@
183188
<CustomToolNamespace>GitHub.VisualStudio.Settings</CustomToolNamespace>
184189
<LastGenOutput>PackageSettingsGen.cs</LastGenOutput>
185190
</Content>
186-
<None Include="packages.config">
187-
<SubType>Designer</SubType>
188-
</None>
189191
<None Include="..\common\settings.json">
190192
<Link>Properties\settings.json</Link>
191193
</None>
@@ -395,12 +397,6 @@
395397
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIX>
396398
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIXLocalOnly>
397399
</ProjectReference>
398-
<ProjectReference Include="..\GitHub.TeamFoundation.16\GitHub.TeamFoundation.16.csproj">
399-
<Project>{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}</Project>
400-
<Name>GitHub.TeamFoundation.16</Name>
401-
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIX>
402-
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIXLocalOnly>
403-
</ProjectReference>
404400
<ProjectReference Include="..\GitHub.UI.Reactive\GitHub.UI.Reactive.csproj">
405401
<Project>{158b05e8-fdbc-4d71-b871-c96e28d5adf5}</Project>
406402
<Name>GitHub.UI.Reactive</Name>

src/GitHub.VisualStudio/source.extension.vsixmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="GitHub.Services.Vssdk" Path="|GitHub.Services.Vssdk|" />
3232
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="GitHub.TeamFoundation.14" TargetVersion="[14.0,15.0)" Path="|GitHub.TeamFoundation.14|" />
3333
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="GitHub.TeamFoundation.15" TargetVersion="[15.0,16.0)" Path="|GitHub.TeamFoundation.15|" />
34-
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="GitHub.TeamFoundation.16" TargetVersion="[16.0,17.0)" Path="|GitHub.TeamFoundation.16|" />
34+
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="File" TargetVersion="[16.0,17.0)" Path="GitHub.TeamFoundation.16.dll" />
3535
<!-- Sometimes the version of `ServiceHub.VSDetouredHost.exe` is used when installing for Visual Studio 2017, see https://github.com/github/VisualStudio/pull/1875 -->
3636
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="GitHub.TeamFoundation.15" TargetVersion="[1.0,2.0)" Path="|GitHub.TeamFoundation.15|" />
3737
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="GitHub.InlineReviewsPackage" Path="|GitHub.InlineReviews;PkgdefProjectOutputGroup|" />

0 commit comments

Comments
 (0)