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

Commit 1472d65

Browse files
grokysgrokys
authored
Merge pull request #1325 from github/fixes/1306-LibGit2Sharp-v2.3.1-with-junk
Stop fighting NuGet
2 parents 6c852c2 + b99d5dc commit 1472d65

File tree

19 files changed

+30
-239
lines changed

19 files changed

+30
-239
lines changed

‎nuget.config

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,7 @@
77
<activePackageSource>
88
<add key="All" value="(Aggregate source)" />
99
</activePackageSource>
10-
</configuration>
10+
<bindingRedirects>
11+
<add key="skip" value="True" />
12+
</bindingRedirects>
13+
</configuration>

‎src/DesignTimeStyleHelper/App.config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,14 @@
4545
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
4646
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
4747
</dependentAssembly>
48+
<dependentAssembly>
49+
<assemblyIdentity name="Microsoft.VisualStudio.ComponentModelHost" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
50+
<bindingRedirect oldVersion="0.0.0.0-14.0.0.0" newVersion="14.0.0.0" />
51+
</dependentAssembly>
52+
<dependentAssembly>
53+
<assemblyIdentity name="Microsoft.VisualStudio.Validation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
54+
<bindingRedirect oldVersion="0.0.0.0-14.0.0.0" newVersion="14.0.0.0" />
55+
</dependentAssembly>
4856
</assemblyBinding>
4957
</runtime>
5058
</configuration>

‎src/GitHub.App/GitHub.App.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
<CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>
1717
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1818
<CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
19+
<NuGetPackageImportStamp>
20+
</NuGetPackageImportStamp>
1921
</PropertyGroup>
2022
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2123
<DebugSymbols>true</DebugSymbols>
@@ -237,9 +239,6 @@
237239
<Resource Include="Images\default_user_avatar.png" />
238240
</ItemGroup>
239241
<ItemGroup>
240-
<None Include="app.config">
241-
<SubType>Designer</SubType>
242-
</None>
243242
<None Include="packages.config">
244243
<SubType>Designer</SubType>
245244
</None>

‎src/GitHub.App/app.config

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

‎src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
<CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>
1616
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1717
<CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
18+
<NuGetPackageImportStamp>
19+
</NuGetPackageImportStamp>
1820
</PropertyGroup>
1921
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2022
<DebugSymbols>true</DebugSymbols>
@@ -171,7 +173,9 @@
171173
<Compile Include="Validation\ReactivePropertyValidator.cs" />
172174
</ItemGroup>
173175
<ItemGroup>
174-
<None Include="packages.config" />
176+
<None Include="packages.config">
177+
<SubType>Designer</SubType>
178+
</None>
175179
</ItemGroup>
176180
<ItemGroup>
177181
<ProjectReference Include="..\..\submodules\akavache\Akavache\Akavache_Net45.csproj">

‎src/GitHub.Exports/GitHub.Exports.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
<CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>
1616
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1717
<CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
18+
<NuGetPackageImportStamp>
19+
</NuGetPackageImportStamp>
1820
</PropertyGroup>
1921
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2022
<DebugSymbols>true</DebugSymbols>
@@ -212,7 +214,9 @@
212214
<Compile Include="..\common\SolutionInfo.cs">
213215
<Link>Properties\SolutionInfo.cs</Link>
214216
</Compile>
215-
<None Include="packages.config" />
217+
<None Include="packages.config">
218+
<SubType>Designer</SubType>
219+
</None>
216220
</ItemGroup>
217221
<ItemGroup>
218222
<Compile Include="Authentication\AuthenticationResultExtensions.cs" />

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,6 @@
164164
<Compile Include="VisualStudioExtensions.cs" />
165165
</ItemGroup>
166166
<ItemGroup>
167-
<None Include="app.config">
168-
<SubType>Designer</SubType>
169-
</None>
170167
<None Include="packages.config">
171168
<SubType>Designer</SubType>
172169
</None>

‎src/GitHub.InlineReviews/app.config

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

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
<Compile Include="StartPagePackage.cs" />
7171
</ItemGroup>
7272
<ItemGroup>
73-
<None Include="app.config" />
7473
<None Include="packages.config">
7574
<SubType>Designer</SubType>
7675
</None>

‎src/GitHub.StartPage/app.config

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

‎src/GitHub.TeamFoundation.14/GitHub.TeamFoundation.14.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>
1818
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1919
<CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
20+
<NuGetPackageImportStamp>
21+
</NuGetPackageImportStamp>
2022
</PropertyGroup>
2123
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2224
<DebugSymbols>true</DebugSymbols>

‎src/GitHub.TeamFoundation.15/GitHub.TeamFoundation.15.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>
1818
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1919
<CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
20+
<NuGetPackageImportStamp>
21+
</NuGetPackageImportStamp>
2022
</PropertyGroup>
2123
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2224
<DebugSymbols>true</DebugSymbols>
@@ -230,9 +232,6 @@
230232
<Link>Properties\SolutionInfo.cs</Link>
231233
</Compile>
232234
<Compile Include="Properties\AssemblyInfo.cs" />
233-
<None Include="app.config">
234-
<SubType>Designer</SubType>
235-
</None>
236235
<None Include="packages.config">
237236
<SubType>Designer</SubType>
238237
</None>

‎src/GitHub.TeamFoundation.15/app.config

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

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<VsixType>v3</VsixType>
1313
<IsProductComponent>false</IsProductComponent>
1414
<ExtensionInstallationFolder>GitHub\GitHub</ExtensionInstallationFolder>
15+
<NuGetPackageImportStamp>
16+
</NuGetPackageImportStamp>
1517
</PropertyGroup>
1618
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1719
<PropertyGroup>
@@ -418,9 +420,6 @@
418420
<CustomToolNamespace>GitHub.VisualStudio.Settings</CustomToolNamespace>
419421
<LastGenOutput>PackageSettingsGen.cs</LastGenOutput>
420422
</Content>
421-
<None Include="app.config">
422-
<SubType>Designer</SubType>
423-
</None>
424423
<None Include="packages.config">
425424
<SubType>Designer</SubType>
426425
</None>

‎src/GitHub.VisualStudio/app.config

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

‎test/GitHub.InlineReviews.UnitTests/GitHub.InlineReviews.UnitTests.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,6 @@
149149
<Compile Include="ViewModels\NewInlineCommentThreadViewModelTests.cs" />
150150
</ItemGroup>
151151
<ItemGroup>
152-
<None Include="app.config">
153-
<SubType>Designer</SubType>
154-
</None>
155152
<None Include="packages.config">
156153
<SubType>Designer</SubType>
157154
</None>

‎test/GitHub.InlineReviews.UnitTests/app.config

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

‎test/UnitTests/UnitTests.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,9 +366,6 @@
366366
</ProjectReference>
367367
</ItemGroup>
368368
<ItemGroup>
369-
<None Include="app.config">
370-
<SubType>Designer</SubType>
371-
</None>
372369
<None Include="packages.config">
373370
<SubType>Designer</SubType>
374371
</None>

‎test/UnitTests/app.config

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

0 commit comments

Comments
 (0)