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

Commit 35ef3f8

Browse files
jcansdalejcansdale
committed
Revert to using packages.config for NuGet
The CI build was failing when I used PackageReference in the project. This should be fixed in a separate PR.
1 parent a9077e1 commit 35ef3f8

File tree

2 files changed

+143
-17
lines changed

2 files changed

+143
-17
lines changed

Diff for: ‎test/IntegrationTests/IntegrationTests.csproj

+109-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props')" />
4+
<Import Project="..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props')" />
5+
<Import Project="..\..\packages\VsixTesting.Xunit.0.1.4-beta\build\VsixTesting.Xunit.props" Condition="Exists('..\..\packages\VsixTesting.Xunit.0.1.4-beta\build\VsixTesting.Xunit.props')" />
36
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
47
<PropertyGroup>
58
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -32,41 +35,130 @@
3235
<WarningLevel>4</WarningLevel>
3336
</PropertyGroup>
3437
<ItemGroup>
38+
<Reference Include="Ben.Demystifier, Version=0.1.0.0, Culture=neutral, PublicKeyToken=a6d206e05440431a, processorArchitecture=MSIL">
39+
<HintPath>..\..\packages\Ben.Demystifier.0.1.1\lib\net45\Ben.Demystifier.dll</HintPath>
40+
</Reference>
41+
<Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
42+
<HintPath>..\..\packages\EnvDTE.8.0.2\lib\net10\EnvDTE.dll</HintPath>
43+
<EmbedInteropTypes>True</EmbedInteropTypes>
44+
</Reference>
45+
<Reference Include="Microsoft.VisualStudio.Imaging, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
46+
<HintPath>..\..\packages\Microsoft.VisualStudio.Imaging.14.3.25407\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath>
47+
</Reference>
48+
<Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
49+
<HintPath>..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
50+
</Reference>
51+
<Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
52+
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll</HintPath>
53+
</Reference>
54+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
55+
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
56+
</Reference>
57+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
58+
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Immutable.11.0.11.0.50727\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
59+
</Reference>
60+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
61+
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Immutable.12.0.12.0.21003\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll</HintPath>
62+
</Reference>
63+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
64+
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll</HintPath>
65+
</Reference>
66+
<Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
67+
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
68+
</Reference>
69+
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
70+
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
71+
</Reference>
72+
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
73+
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
74+
</Reference>
75+
<Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
76+
<HintPath>..\..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
77+
</Reference>
78+
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
79+
<HintPath>..\..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
80+
</Reference>
81+
<Reference Include="Microsoft.VisualStudio.Threading, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
82+
<HintPath>..\..\packages\Microsoft.VisualStudio.Threading.14.1.111\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
83+
</Reference>
84+
<Reference Include="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
85+
<HintPath>..\..\packages\Microsoft.VisualStudio.Utilities.14.3.25407\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
86+
</Reference>
87+
<Reference Include="Microsoft.VisualStudio.Validation, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
88+
<HintPath>..\..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
89+
</Reference>
90+
<Reference Include="PresentationFramework" />
91+
<Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
92+
<HintPath>..\..\packages\stdole.7.0.3302\lib\net10\stdole.dll</HintPath>
93+
<EmbedInteropTypes>True</EmbedInteropTypes>
94+
</Reference>
3595
<Reference Include="System" />
96+
<Reference Include="System.Collections.Immutable, Version=1.2.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
97+
<HintPath>..\..\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
98+
</Reference>
3699
<Reference Include="System.Core" />
100+
<Reference Include="System.Reflection.Metadata, Version=1.4.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
101+
<HintPath>..\..\packages\System.Reflection.Metadata.1.5.0\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath>
102+
</Reference>
103+
<Reference Include="System.Runtime.Remoting" />
104+
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
105+
<HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>
106+
<Private>True</Private>
107+
<Private>True</Private>
108+
</Reference>
37109
<Reference Include="System.Xml.Linq" />
38110
<Reference Include="System.Data.DataSetExtensions" />
39111
<Reference Include="Microsoft.CSharp" />
40112
<Reference Include="System.Data" />
41113
<Reference Include="System.Net.Http" />
42114
<Reference Include="System.Xml" />
115+
<Reference Include="VsixTesting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d7b0be24f99325ce, processorArchitecture=MSIL">
116+
<HintPath>..\..\packages\VsixTesting.Xunit.0.1.4-beta\lib\net452\VsixTesting.dll</HintPath>
117+
</Reference>
118+
<Reference Include="VsixTesting.Xunit, Version=0.1.0.0, Culture=neutral, PublicKeyToken=d7b0be24f99325ce, processorArchitecture=MSIL">
119+
<HintPath>..\..\packages\VsixTesting.Xunit.0.1.4-beta\lib\net452\VsixTesting.Xunit.dll</HintPath>
120+
</Reference>
121+
<Reference Include="WindowsBase" />
122+
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
123+
<HintPath>..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll</HintPath>
124+
</Reference>
125+
<Reference Include="xunit.assert, Version=2.4.1.4059, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
126+
<HintPath>..\..\packages\xunit.assert.2.4.1-pre.build.4059\lib\netstandard2.0\xunit.assert.dll</HintPath>
127+
</Reference>
128+
<Reference Include="xunit.core, Version=2.4.1.4059, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
129+
<HintPath>..\..\packages\xunit.extensibility.core.2.4.1-pre.build.4059\lib\net452\xunit.core.dll</HintPath>
130+
</Reference>
131+
<Reference Include="xunit.execution.desktop, Version=2.4.1.4059, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
132+
<HintPath>..\..\packages\xunit.extensibility.execution.2.4.1-pre.build.4059\lib\net452\xunit.execution.desktop.dll</HintPath>
133+
</Reference>
43134
</ItemGroup>
44135
<ItemGroup>
45136
<Compile Include="GitHubPaneIntegrationTests.cs" />
46137
<Compile Include="Properties\AssemblyInfo.cs" />
47138
</ItemGroup>
48-
<ItemGroup>
49-
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes">
50-
<Version>15.0.21</Version>
51-
</PackageReference>
52-
<PackageReference Include="Microsoft.VisualStudio.Shell.14.0">
53-
<Version>14.3.25407</Version>
54-
</PackageReference>
55-
<PackageReference Include="VsixTesting.Xunit">
56-
<Version>0.1.4-beta</Version>
57-
</PackageReference>
58-
<PackageReference Include="xunit">
59-
<Version>2.4.1-pre.build.4059</Version>
60-
</PackageReference>
61-
<PackageReference Include="xunit.runner.visualstudio">
62-
<Version>2.4.1-pre.build.4059</Version>
63-
</PackageReference>
64-
</ItemGroup>
65139
<ItemGroup>
66140
<ProjectReference Include="..\..\src\GitHub.Exports\GitHub.Exports.csproj">
67141
<Project>{9aea02db-02b5-409c-b0ca-115d05331a6b}</Project>
68142
<Name>GitHub.Exports</Name>
69143
</ProjectReference>
70144
</ItemGroup>
145+
<ItemGroup>
146+
<None Include="packages.config" />
147+
</ItemGroup>
148+
<ItemGroup>
149+
<Analyzer Include="..\..\packages\xunit.analyzers.0.10.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
150+
</ItemGroup>
71151
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
152+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
153+
<PropertyGroup>
154+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
155+
</PropertyGroup>
156+
<Error Condition="!Exists('..\..\packages\VsixTesting.Xunit.0.1.4-beta\build\VsixTesting.Xunit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\VsixTesting.Xunit.0.1.4-beta\build\VsixTesting.Xunit.props'))" />
157+
<Error Condition="!Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props'))" />
158+
<Error Condition="!Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets'))" />
159+
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props'))" />
160+
<Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.21\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.21\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets'))" />
161+
</Target>
162+
<Import Project="..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets')" />
163+
<Import Project="..\..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.21\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.21\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" />
72164
</Project>

Diff for: ‎test/IntegrationTests/packages.config

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Ben.Demystifier" version="0.1.1" targetFramework="net461" />
4+
<package id="EnvDTE" version="8.0.2" targetFramework="net461" />
5+
<package id="Microsoft.VisualStudio.Imaging" version="14.3.25407" targetFramework="net461" />
6+
<package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net461" />
7+
<package id="Microsoft.VisualStudio.SDK.EmbedInteropTypes" version="15.0.21" targetFramework="net461" />
8+
<package id="Microsoft.VisualStudio.Shell.14.0" version="14.3.25407" targetFramework="net461" />
9+
<package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net461" />
10+
<package id="Microsoft.VisualStudio.Shell.Immutable.11.0" version="11.0.50727" targetFramework="net461" />
11+
<package id="Microsoft.VisualStudio.Shell.Immutable.12.0" version="12.0.21003" targetFramework="net461" />
12+
<package id="Microsoft.VisualStudio.Shell.Immutable.14.0" version="14.3.25407" targetFramework="net461" />
13+
<package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6071" targetFramework="net461" />
14+
<package id="Microsoft.VisualStudio.Shell.Interop.8.0" version="8.0.50727" targetFramework="net461" />
15+
<package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30729" targetFramework="net461" />
16+
<package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net461" />
17+
<package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net461" />
18+
<package id="Microsoft.VisualStudio.Threading" version="14.1.111" targetFramework="net461" />
19+
<package id="Microsoft.VisualStudio.Utilities" version="14.3.25407" targetFramework="net461" />
20+
<package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net461" />
21+
<package id="stdole" version="7.0.3302" targetFramework="net461" />
22+
<package id="System.Collections.Immutable" version="1.4.0" targetFramework="net461" />
23+
<package id="System.Reflection.Metadata" version="1.5.0" targetFramework="net461" />
24+
<package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
25+
<package id="VsixTesting.Xunit" version="0.1.4-beta" targetFramework="net461" />
26+
<package id="xunit" version="2.4.1-pre.build.4059" targetFramework="net461" />
27+
<package id="xunit.abstractions" version="2.0.3" targetFramework="net461" />
28+
<package id="xunit.analyzers" version="0.10.0" targetFramework="net461" />
29+
<package id="xunit.assert" version="2.4.1-pre.build.4059" targetFramework="net461" />
30+
<package id="xunit.core" version="2.4.1-pre.build.4059" targetFramework="net461" />
31+
<package id="xunit.extensibility.core" version="2.4.1-pre.build.4059" targetFramework="net461" />
32+
<package id="xunit.extensibility.execution" version="2.4.1-pre.build.4059" targetFramework="net461" />
33+
<package id="xunit.runner.visualstudio" version="2.4.1-pre.build.4059" targetFramework="net461" developmentDependency="true" />
34+
</packages>

0 commit comments

Comments
 (0)