Skip to content

Commit b459a20

Browse files
vosenvosen
committed
Merge pull request #175 from vosen/master
Move dependencies to vsxdeps
2 parents 147f665 + 71b62b2 commit b459a20

22 files changed

Lines changed: 611 additions & 219 deletions

‎MIEngine‎

‎Microsoft.VisualStudio.Project/Microsoft.VisualStudio.Project.csproj‎

Lines changed: 151 additions & 45 deletions
Large diffs are not rendered by default.

‎Microsoft.VisualStudio.Project/ProjectReferenceNode.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
using System.IO;
2222
using System.Linq;
2323
using System.Runtime.InteropServices;
24-
using Microsoft.CSharp.RuntimeBinder;
2524
using Microsoft.VisualStudio.Shell;
2625
using Microsoft.VisualStudio.Shell.Interop;
2726

‎Microsoft.VisualStudio.Project/app.config‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="EnvDTE" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎Microsoft.VisualStudio.Project/packages.config‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="VSSDK.ComponentModelHost" version="12.0.4" targetFramework="net45" />
4+
<package id="VSSDK.CoreUtility" version="12.0.4" targetFramework="net45" />
5+
<package id="VSSDK.Debugger.Interop.9" version="9.0.4" targetFramework="net45" />
6+
<package id="VSSDK.DTE" version="7.0.4" targetFramework="net45" />
7+
<package id="VSSDK.DTE.8" version="8.0.4" targetFramework="net45" />
8+
<package id="VSSDK.Editor" version="12.0.4" targetFramework="net45" />
9+
<package id="VSSDK.GraphModel" version="12.0.4" targetFramework="net45" />
10+
<package id="VSSDK.IDE" version="7.0.4" targetFramework="net45" />
11+
<package id="VSSDK.IDE.10" version="10.0.4" targetFramework="net45" />
12+
<package id="VSSDK.IDE.11" version="11.0.4" targetFramework="net45" />
13+
<package id="VSSDK.IDE.12" version="12.0.4" targetFramework="net45" />
14+
<package id="VSSDK.IDE.8" version="8.0.4" targetFramework="net45" />
15+
<package id="VSSDK.IDE.9" version="9.0.4" targetFramework="net45" />
16+
<package id="VSSDK.Language" version="12.0.4" targetFramework="net45" />
17+
<package id="VSSDK.LanguageService.12" version="12.0.4" targetFramework="net45" />
18+
<package id="VSSDK.OLE.Interop" version="7.0.4" targetFramework="net45" />
19+
<package id="VSSDK.Shell.12" version="12.0.4" targetFramework="net45" />
20+
<package id="VSSDK.Shell.Immutable.10" version="10.0.4" targetFramework="net45" />
21+
<package id="VSSDK.Shell.Immutable.11" version="11.0.4" targetFramework="net45" />
22+
<package id="VSSDK.Shell.Immutable.12" version="12.0.4" targetFramework="net45" />
23+
<package id="VSSDK.Shell.Interop" version="7.0.4" targetFramework="net45" />
24+
<package id="VSSDK.Shell.Interop.10" version="10.0.4" targetFramework="net45" />
25+
<package id="VSSDK.Shell.Interop.11" version="11.0.4" targetFramework="net45" />
26+
<package id="VSSDK.Shell.Interop.12" version="12.0.4" targetFramework="net45" />
27+
<package id="VSSDK.Shell.Interop.8" version="8.0.4" targetFramework="net45" />
28+
<package id="VSSDK.Shell.Interop.9" version="9.0.4" targetFramework="net45" />
29+
<package id="VSSDK.Text" version="12.0.4" targetFramework="net45" />
30+
<package id="VSSDK.TextManager.Interop" version="7.0.4" targetFramework="net45" />
31+
<package id="VSSDK.TextManager.Interop.8" version="8.0.4" targetFramework="net45" />
32+
<package id="VSSDK.Threading" version="12.0.4" targetFramework="net45" />
33+
<package id="VSSDK.Threading.12" version="12.0.4" targetFramework="net45" />
34+
<package id="VSSDK.VSLangProj" version="7.0.4" targetFramework="net45" />
35+
</packages>

‎RustLexer/RustLexer.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@
5151
</Reference>
5252
<Reference Include="System" />
5353
<Reference Include="System.Core" />
54-
<Reference Include="System.Xml.Linq" />
55-
<Reference Include="System.Data.DataSetExtensions" />
56-
<Reference Include="Microsoft.CSharp" />
57-
<Reference Include="System.Data" />
58-
<Reference Include="System.Xml" />
5954
</ItemGroup>
6055
<ItemGroup>
6156
<Compile Include="RustLexer.g4.cs">

‎VisualRust.Build/VisualRust.Build.csproj‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,10 @@
3838
<ErrorReport>prompt</ErrorReport>
3939
</PropertyGroup>
4040
<ItemGroup>
41-
<Reference Include="Microsoft.Build" />
4241
<Reference Include="Microsoft.Build.Framework" />
43-
<Reference Include="Microsoft.Build.Tasks.v4.0" />
4442
<Reference Include="Microsoft.Build.Utilities.v4.0" />
4543
<Reference Include="System" />
4644
<Reference Include="System.Core" />
47-
<Reference Include="System.Xml.Linq" />
48-
<Reference Include="System.Data.DataSetExtensions" />
49-
<Reference Include="Microsoft.CSharp" />
50-
<Reference Include="System.Data" />
51-
<Reference Include="System.Xml" />
5245
</ItemGroup>
5346
<ItemGroup>
5447
<Compile Include="RustcParsedMessage.cs" />

‎VisualRust.Project/RustProjectNodeProperties.cs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Microsoft.VisualStudioTools.Project;
1+
using Microsoft.VisualStudio.Shell.Interop;
2+
using Microsoft.VisualStudioTools.Project;
23
using System;
34
using System.Collections.Generic;
45
using System.ComponentModel;
@@ -17,30 +18,30 @@ internal RustProjectNodeProperties(CommonProjectNode node)
1718
{ }
1819

1920
[Browsable(false)]
20-
public VSLangProj.prjOutputType OutputType
21+
public __VSPROJOUTPUTTYPE OutputType
2122
{
2223
get
2324
{
2425
string type = this.Node.ProjectMgr.GetProjectProperty("OutputType");
2526
if(type.Equals("library", StringComparison.OrdinalIgnoreCase))
2627
{
27-
return VSLangProj.prjOutputType.prjOutputTypeLibrary;
28+
return __VSPROJOUTPUTTYPE.VSPROJ_OUTPUTTYPE_LIBRARY;
2829
}
2930
else if (type.Equals("winexe", StringComparison.OrdinalIgnoreCase))
3031
{
31-
return VSLangProj.prjOutputType.prjOutputTypeWinExe;
32+
return __VSPROJOUTPUTTYPE.VSPROJ_OUTPUTTYPE_WINEXE;
3233
}
33-
return VSLangProj.prjOutputType.prjOutputTypeExe;
34+
return __VSPROJOUTPUTTYPE.VSPROJ_OUTPUTTYPE_EXE;
3435
}
3536
set
3637
{
3738
string val;
3839
switch (value)
3940
{
40-
case VSLangProj.prjOutputType.prjOutputTypeWinExe:
41+
case __VSPROJOUTPUTTYPE.VSPROJ_OUTPUTTYPE_WINEXE:
4142
val = "winexe";
4243
break;
43-
case VSLangProj.prjOutputType.prjOutputTypeLibrary:
44+
case __VSPROJOUTPUTTYPE.VSPROJ_OUTPUTTYPE_LIBRARY:
4445
val = "library";
4546
break;
4647
default:

‎VisualRust.Project/VisualRust.Project.csproj‎

Lines changed: 71 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<SignAssembly>True</SignAssembly>
1414
<AssemblyOriginatorKeyFile>..\VisualRust\Key.snk</AssemblyOriginatorKeyFile>
1515
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
16-
<NuGetPackageImportStamp>902b3a64</NuGetPackageImportStamp>
1716
</PropertyGroup>
1817
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1918
<DebugSymbols>true</DebugSymbols>
@@ -47,45 +46,98 @@
4746
<ErrorReport>prompt</ErrorReport>
4847
</PropertyGroup>
4948
<ItemGroup>
50-
<Reference Include="Antlr4.Runtime.net45">
49+
<Reference Include="Antlr4.Runtime.net45, Version=4.3.0.0, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
5150
<HintPath>..\packages\Antlr4.Runtime.4.3.0\lib\net45\Antlr4.Runtime.net45.dll</HintPath>
5251
</Reference>
5352
<Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
5453
<EmbedInteropTypes>False</EmbedInteropTypes>
54+
<HintPath>..\packages\VSSDK.DTE.7.0.4\lib\net20\envdte.dll</HintPath>
55+
<Private>False</Private>
5556
</Reference>
5657
<Reference Include="envdte80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
5758
<EmbedInteropTypes>False</EmbedInteropTypes>
59+
<HintPath>..\packages\VSSDK.DTE.8.8.0.4\lib\net20\envdte80.dll</HintPath>
60+
<Private>False</Private>
5861
</Reference>
5962
<Reference Include="Microsoft.Build" />
60-
<Reference Include="Microsoft.VisualStudio.Debugger.Interop.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
61-
<Reference Include="Microsoft.VisualStudio.Debugger.InteropA, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
62-
<Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
63-
<Reference Include="Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
64-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
65-
<Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
63+
<Reference Include="Microsoft.VisualStudio.GraphModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
64+
<HintPath>..\packages\VSSDK.GraphModel.11.0.4\lib\net45\Microsoft.VisualStudio.GraphModel.dll</HintPath>
65+
<Private>False</Private>
66+
</Reference>
67+
<Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
68+
<HintPath>..\packages\VSSDK.OLE.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
69+
<Private>False</Private>
70+
</Reference>
71+
<Reference Include="Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
72+
<HintPath>..\packages\VSSDK.Shell.12.12.0.4\lib\net45\Microsoft.VisualStudio.Shell.12.0.dll</HintPath>
73+
<Private>False</Private>
74+
</Reference>
75+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
76+
<HintPath>..\packages\VSSDK.Shell.Immutable.10.10.0.4\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
77+
<Private>False</Private>
78+
</Reference>
79+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
80+
<HintPath>..\packages\VSSDK.Shell.Immutable.11.11.0.4\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
81+
<Private>False</Private>
82+
</Reference>
83+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
84+
<HintPath>..\packages\VSSDK.Shell.Immutable.12.12.0.4\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll</HintPath>
85+
<Private>False</Private>
86+
</Reference>
87+
<Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
88+
<HintPath>..\packages\VSSDK.Shell.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
89+
<Private>False</Private>
90+
</Reference>
6691
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
6792
<EmbedInteropTypes>False</EmbedInteropTypes>
93+
<HintPath>..\packages\VSSDK.Shell.Interop.10.10.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.10.0.dll</HintPath>
94+
<Private>False</Private>
6895
</Reference>
6996
<Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
7097
<EmbedInteropTypes>False</EmbedInteropTypes>
98+
<HintPath>..\packages\VSSDK.Shell.Interop.11.11.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.11.0.dll</HintPath>
99+
<Private>False</Private>
100+
</Reference>
101+
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
102+
<HintPath>..\packages\VSSDK.Shell.Interop.8.8.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
103+
<Private>False</Private>
104+
</Reference>
105+
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
106+
<HintPath>..\packages\VSSDK.Shell.Interop.9.9.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
107+
<Private>False</Private>
108+
</Reference>
109+
<Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
110+
<HintPath>..\packages\VSSDK.TextManager.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
111+
<Private>False</Private>
112+
</Reference>
113+
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
114+
<HintPath>..\packages\VSSDK.TextManager.Interop.8.8.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
115+
<Private>False</Private>
116+
</Reference>
117+
<Reference Include="Microsoft.VisualStudio.Threading, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
118+
<HintPath>..\packages\VSSDK.Threading.12.0.4\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
119+
<Private>False</Private>
71120
</Reference>
72-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
73-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
74121
<Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
75122
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
76123
</Reference>
124+
<Reference Include="PresentationCore" />
125+
<Reference Include="PresentationFramework" />
126+
<Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
127+
<EmbedInteropTypes>False</EmbedInteropTypes>
128+
<HintPath>..\packages\VSSDK.DTE.7.0.4\lib\net20\stdole.dll</HintPath>
129+
<Private>False</Private>
130+
</Reference>
77131
<Reference Include="System" />
78132
<Reference Include="System.Core" />
133+
<Reference Include="System.Design" />
79134
<Reference Include="System.Drawing" />
135+
<Reference Include="System.Transactions" />
80136
<Reference Include="System.Windows.Forms" />
81-
<Reference Include="System.Xml.Linq" />
82-
<Reference Include="System.Data.DataSetExtensions" />
83-
<Reference Include="Microsoft.CSharp" />
84-
<Reference Include="System.Data" />
85137
<Reference Include="System.Xml" />
86-
<Reference Include="VSLangProj, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
87-
<EmbedInteropTypes>False</EmbedInteropTypes>
88-
</Reference>
138+
<Reference Include="System.Xml.Linq" />
139+
<Reference Include="UIAutomationTypes" />
140+
<Reference Include="WindowsBase" />
89141
</ItemGroup>
90142
<ItemGroup>
91143
<Compile Include="BaseFileNode.cs" />
@@ -167,10 +219,6 @@
167219
<Project>{6D2688FE-6FD8-44A8-B96A-6037457F72A7}</Project>
168220
<Name>MIDebugEngine</Name>
169221
</ProjectReference>
170-
<ProjectReference Include="..\VisualRust.Build\VisualRust.Build.csproj">
171-
<Project>{9cf556ab-76fe-4c3d-ad0a-b64b3b9989b4}</Project>
172-
<Name>VisualRust.Build</Name>
173-
</ProjectReference>
174222
<ProjectReference Include="..\VisualRust.Shared\VisualRust.Shared.csproj">
175223
<Project>{b99cc9eb-90f2-4040-9e66-418cc7042153}</Project>
176224
<Name>VisualRust.Shared</Name>
@@ -181,6 +229,7 @@
181229
<Generator>MSBuild:Compile</Generator>
182230
<CustomToolNamespace>VisualRust.Project</CustomToolNamespace>
183231
</Antlr4>
232+
<None Include="app.config" />
184233
<None Include="packages.config" />
185234
</ItemGroup>
186235
<ItemGroup>
@@ -218,7 +267,7 @@
218267
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
219268
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
220269
<PropertyGroup>
221-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
270+
<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>
222271
</PropertyGroup>
223272
<Error Condition="!Exists('..\packages\Antlr4.4.3.0\build\Antlr4.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Antlr4.4.3.0\build\Antlr4.props'))" />
224273
<Error Condition="!Exists('..\packages\Antlr4.4.3.0\build\Antlr4.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Antlr4.4.3.0\build\Antlr4.targets'))" />

‎VisualRust.Project/app.config‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="EnvDTE" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

0 commit comments

Comments
 (0)