зеркало из https://github.com/github/VisualStudio.git
Switch to a custom nuget package of Rothko
This commit is contained in:
Andreia Gaita
Родитель
8021f1090b
Коммит
81224df5a9
|
|
@ -1,6 +1,3 @@
|
|||
[submodule "submodules/rothko"]
|
||||
path = submodules/rothko
|
||||
url = https://github.com/editor-tools/Rothko.git
|
||||
[submodule "submodules/reactiveui"]
|
||||
path = submodules/reactiveui
|
||||
url = https://github.com/editor-tools/ReactiveUI
|
||||
|
|
|
|||
14
GitHubVS.sln
14
GitHubVS.sln
|
|
@ -27,8 +27,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.App", "src\GitHub.Ap
|
|||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Submodules", "Submodules", "{1E7F7253-A6AF-43C4-A955-37BEDDA01AB8}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rothko", "submodules\Rothko\src\Rothko.csproj", "{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{8E1F1B4E-AEA2-4AB1-8F73-423A903550A1}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
script\Modules\BuildUtils.psm1 = script\Modules\BuildUtils.psm1
|
||||
|
|
@ -199,17 +197,6 @@ Global
|
|||
{1A1DA411-8D1F-4578-80A6-04576BEA2DC5}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{1A1DA411-8D1F-4578-80A6-04576BEA2DC5}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{1A1DA411-8D1F-4578-80A6-04576BEA2DC5}.Release|x86.Build.0 = Release|Any CPU
|
||||
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Debug|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Debug|Any CPU.Build.0 = Release|Any CPU
|
||||
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Debug|x86.ActiveCfg = Release|Any CPU
|
||||
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Debug|x86.Build.0 = Release|Any CPU
|
||||
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Publish|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Publish|x86.ActiveCfg = Release|Any CPU
|
||||
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Publish|x86.Build.0 = Release|Any CPU
|
||||
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Release|x86.Build.0 = Release|Any CPU
|
||||
{9AEA02DB-02B5-409C-B0CA-115D05331A6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9AEA02DB-02B5-409C-B0CA-115D05331A6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9AEA02DB-02B5-409C-B0CA-115D05331A6B}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
|
|
@ -479,7 +466,6 @@ Global
|
|||
EndGlobalSection
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
{596595A6-2A3C-469E-9386-9E3767D863A5} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD}
|
||||
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8}
|
||||
{8E1F1B4E-AEA2-4AB1-8F73-423A903550A1} = {7B6C5F8D-14B3-443D-B044-0E209AE12BDF}
|
||||
{1E7F7253-A6AF-43C4-A955-37BEDDA01AC0} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8}
|
||||
{08DD4305-7787-4823-A53F-4D0F725A07F3} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AC0}
|
||||
|
|
|
|||
Двоичный файл не отображается.
|
|
@ -47,6 +47,10 @@
|
|||
<Reference Include="Moq">
|
||||
<HintPath>..\..\packages\Moq.4.2.1312.1319\lib\net40\Moq.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="rothko, Version=0.0.2.0, Culture=neutral, PublicKeyToken=9f664c41f503810a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Rothko.0.0.2-ghfvs\lib\net45\rothko.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.ComponentModel.Composition" />
|
||||
<Reference Include="System.Data" />
|
||||
|
|
@ -148,10 +152,6 @@
|
|||
<None Include="App.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\submodules\Rothko\src\Rothko.csproj">
|
||||
<Project>{4a84e568-ca86-4510-8cd0-90d3ef9b65f9}</Project>
|
||||
<Name>Rothko</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.Api\GitHub.Api.csproj">
|
||||
<Project>{b389adaf-62cc-486e-85b4-2d8b078df763}</Project>
|
||||
<Name>GitHub.Api</Name>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
<packages>
|
||||
<package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net461" />
|
||||
<package id="Moq" version="4.2.1312.1319" targetFramework="net45" userInstalled="true" />
|
||||
<package id="Rothko" version="0.0.2-ghfvs" targetFramework="net461" />
|
||||
<package id="Rx-Core" version="2.2.5-custom" targetFramework="net45" userInstalled="true" />
|
||||
<package id="Rx-Interfaces" version="2.2.5-custom" targetFramework="net45" userInstalled="true" />
|
||||
<package id="Rx-Linq" version="2.2.5-custom" targetFramework="net45" userInstalled="true" />
|
||||
|
|
|
|||
|
|
@ -86,6 +86,10 @@
|
|||
</Reference>
|
||||
<Reference Include="PresentationCore" />
|
||||
<Reference Include="PresentationFramework" />
|
||||
<Reference Include="rothko, Version=0.0.2.0, Culture=neutral, PublicKeyToken=9f664c41f503810a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Rothko.0.0.2-ghfvs\lib\net45\rothko.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="SQLitePCL.raw, Version=0.7.3.0, Culture=neutral, PublicKeyToken=d89a3d1cc066b805, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\lib\net45\SQLitePCL.raw.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
|
|
@ -300,10 +304,6 @@
|
|||
<Project>{158b05e8-fdbc-4d71-b871-c96e28d5adf5}</Project>
|
||||
<Name>GitHub.UI.Reactive</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\submodules\Rothko\src\Rothko.csproj">
|
||||
<Project>{4a84e568-ca86-4510-8cd0-90d3ef9b65f9}</Project>
|
||||
<Name>Rothko</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="Resources.resx">
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
<package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net461" />
|
||||
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
|
||||
<package id="NLog" version="3.1.0.0" targetFramework="net45" />
|
||||
<package id="Rothko" version="0.0.2-ghfvs" targetFramework="net461" />
|
||||
<package id="Rx-Core" version="2.2.5-custom" targetFramework="net45" />
|
||||
<package id="Rx-Interfaces" version="2.2.5-custom" targetFramework="net45" />
|
||||
<package id="Rx-Linq" version="2.2.5-custom" targetFramework="net45" />
|
||||
|
|
|
|||
|
|
@ -114,6 +114,10 @@
|
|||
</Reference>
|
||||
<Reference Include="PresentationCore" />
|
||||
<Reference Include="PresentationFramework" />
|
||||
<Reference Include="rothko, Version=0.0.2.0, Culture=neutral, PublicKeyToken=9f664c41f503810a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Rothko.0.0.2-ghfvs\lib\net45\rothko.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.ComponentModel.Composition" />
|
||||
<Reference Include="System.Core" />
|
||||
|
|
@ -258,10 +262,6 @@
|
|||
<Project>{08dd4305-7787-4823-a53f-4d0f725a07f3}</Project>
|
||||
<Name>Octokit</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\submodules\Rothko\src\Rothko.csproj">
|
||||
<Project>{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}</Project>
|
||||
<Name>Rothko</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.Extensions\GitHub.Extensions.csproj">
|
||||
<Project>{6afe2e2d-6db0-4430-a2ea-f5f5388d2f78}</Project>
|
||||
<Name>GitHub.Extensions</Name>
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
<package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net461" />
|
||||
<package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net461" />
|
||||
<package id="Microsoft.VisualStudio.Threading" version="14.1.131" targetFramework="net461" />
|
||||
<package id="Rothko" version="0.0.2-ghfvs" targetFramework="net461" />
|
||||
<package id="SimpleJson" version="0.38.0" targetFramework="net461" />
|
||||
<package id="VSSDK.ComponentModelHost" version="12.0.4" targetFramework="net461" />
|
||||
<package id="VSSDK.IDE.12" version="12.0.4" targetFramework="net461" />
|
||||
|
|
|
|||
|
|
@ -171,10 +171,6 @@
|
|||
<Project>{1CE2D235-8072-4649-BA5A-CFB1AF8776E0}</Project>
|
||||
<Name>ReactiveUI_Net45</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\submodules\Rothko\src\Rothko.csproj">
|
||||
<Project>{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}</Project>
|
||||
<Name>Rothko</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\submodules\splat\Splat\Splat-Net45.csproj">
|
||||
<Project>{252ce1c2-027a-4445-a3c2-e4d6c80a935a}</Project>
|
||||
<Name>Splat-Net45</Name>
|
||||
|
|
@ -335,6 +331,10 @@
|
|||
</Reference>
|
||||
<Reference Include="PresentationCore" />
|
||||
<Reference Include="PresentationFramework" />
|
||||
<Reference Include="rothko, Version=0.0.2.0, Culture=neutral, PublicKeyToken=9f664c41f503810a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Rothko.0.0.2-ghfvs\lib\net45\rothko.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<EmbedInteropTypes>False</EmbedInteropTypes>
|
||||
</Reference>
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
<package id="Microsoft.VisualStudio.Utilities" version="14.3.25407" targetFramework="net452" />
|
||||
<package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net452" />
|
||||
<package id="Microsoft.VSSDK.BuildTools" version="14.3.25407" targetFramework="net452" developmentDependency="true" />
|
||||
<package id="Rothko" version="0.0.2-ghfvs" targetFramework="net461" />
|
||||
<package id="Rx-Core" version="2.2.5-custom" targetFramework="net461" />
|
||||
<package id="Rx-Interfaces" version="2.2.5-custom" targetFramework="net461" />
|
||||
<package id="Rx-Linq" version="2.2.5-custom" targetFramework="net461" />
|
||||
|
|
|
|||
|
|
@ -233,6 +233,10 @@
|
|||
<HintPath>..\..\packages\NLog.3.1.0.0\lib\net45\NLog.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="rothko, Version=0.0.2.0, Culture=neutral, PublicKeyToken=9f664c41f503810a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Rothko.0.0.2-ghfvs\lib\net45\rothko.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="SQLitePCL.raw, Version=0.7.3.0, Culture=neutral, PublicKeyToken=d89a3d1cc066b805, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\lib\net45\SQLitePCL.raw.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
|
|
@ -693,13 +697,6 @@
|
|||
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIX>
|
||||
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIXLocalOnly>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\submodules\Rothko\src\Rothko.csproj">
|
||||
<Project>{4a84e568-ca86-4510-8cd0-90d3ef9b65f9}</Project>
|
||||
<Name>Rothko</Name>
|
||||
<Private>False</Private>
|
||||
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIX>
|
||||
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIXLocalOnly>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.VisualStudio.UI\GitHub.VisualStudio.UI.csproj">
|
||||
<Project>{d1dfbb0c-b570-4302-8f1e-2e3a19c41961}</Project>
|
||||
<Name>GitHub.VisualStudio.UI</Name>
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@
|
|||
<package id="Microsoft.VSSDK.Vsixsigntool" version="14.1.24720" targetFramework="net45" />
|
||||
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
|
||||
<package id="NLog" version="3.1.0" targetFramework="net45" />
|
||||
<package id="Rothko" version="0.0.2-ghfvs" targetFramework="net461" />
|
||||
<package id="Rx-Core" version="2.2.5-custom" targetFramework="net45" />
|
||||
<package id="Rx-Interfaces" version="2.2.5-custom" targetFramework="net45" />
|
||||
<package id="Rx-Linq" version="2.2.5-custom" targetFramework="net45" />
|
||||
|
|
|
|||
|
|
@ -23,14 +23,14 @@
|
|||
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
|
||||
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="GitHub.Exports" Path="|GitHub.Exports|" />
|
||||
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="GitHub.Api" Path="|GitHub.Api|" />
|
||||
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="Rothko" Path="|Rothko|" />
|
||||
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="GitHub.Exports.Reactive" Path="|GitHub.Exports.Reactive|" />
|
||||
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="GitHub.App" Path="|GitHub.App|" />
|
||||
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="GitHub.TeamFoundation.14" Path="|GitHub.TeamFoundation.14|" />
|
||||
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="GitHub.TeamFoundation.15" Path="|GitHub.TeamFoundation.15|" />
|
||||
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="GitHub.StartPage" Path="|GitHub.InlineReviews;PkgdefProjectOutputGroup|" />
|
||||
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="GitHub.InlineReviewsPackage" Path="|GitHub.InlineReviews;PkgdefProjectOutputGroup|" />
|
||||
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="GitHub.StartPage" Path="|GitHub.StartPage;PkgdefProjectOutputGroup|" />
|
||||
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="GitHub.InlineReviews" Path="|GitHub.InlineReviews|" />
|
||||
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="File" Path="Rothko.dll" />
|
||||
</Assets>
|
||||
<Prerequisites>
|
||||
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.25824.0,16.0)" DisplayName="Visual Studio core editor" />
|
||||
|
|
|
|||
|
|
@ -162,6 +162,10 @@
|
|||
<HintPath>..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="rothko, Version=0.0.2.0, Culture=neutral, PublicKeyToken=9f664c41f503810a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Rothko.0.0.2-ghfvs\lib\net45\rothko.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="PresentationCore" />
|
||||
<Reference Include="PresentationFramework" />
|
||||
<Reference Include="System" />
|
||||
|
|
@ -305,10 +309,6 @@
|
|||
<Project>{1ce2d235-8072-4649-ba5a-cfb1af8776e0}</Project>
|
||||
<Name>ReactiveUI_Net45</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\submodules\Rothko\src\Rothko.csproj">
|
||||
<Project>{4a84e568-ca86-4510-8cd0-90d3ef9b65f9}</Project>
|
||||
<Name>Rothko</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\submodules\splat\Splat\Splat-Net45.csproj">
|
||||
<Project>{252ce1c2-027a-4445-a3c2-e4d6c80a935a}</Project>
|
||||
<Name>Splat-Net45</Name>
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit ff23501d91c9bca3cf7ab40848ba25eeee47d188
|
||||
|
|
@ -146,10 +146,6 @@
|
|||
<Project>{1CE2D235-8072-4649-BA5A-CFB1AF8776E0}</Project>
|
||||
<Name>ReactiveUI_Net45</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\submodules\Rothko\src\Rothko.csproj">
|
||||
<Project>{4a84e568-ca86-4510-8cd0-90d3ef9b65f9}</Project>
|
||||
<Name>Rothko</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\submodules\splat\Splat\Splat-Net45.csproj">
|
||||
<Project>{252ce1c2-027a-4445-a3c2-e4d6c80a935a}</Project>
|
||||
<Name>Splat-Net45</Name>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче