Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

体验新版 GitCode，发现更多精彩内容 >>

提交 7d24d820 编写于 作者: J Jason Malinowski
浏览文件
操作

Merge pull request #5020 from jasonmalinowski/project.json-fixes 

project.json Fixes
上级 e9dbd805 84d7856e
隐藏空白更改
内联 并排
Showing with 139 addition and 8 deletion
Roslyn.sln
浏览文件 @ 7d24d820
......@@ -585,22 +585,22 @@ Global
{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|x86.Build.0 = Release|Any CPU
{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|ARM.ActiveCfg = Debug|ARM
{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|ARM.Build.0 = Debug|ARM
{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|ARM.ActiveCfg = Debug|Any CPU
{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|ARM.Build.0 = Debug|Any CPU
{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|x64.ActiveCfg = Debug|x64
{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|x64.Build.0 = Debug|x64
{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|x64.ActiveCfg = Debug|Any CPU
{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|x64.Build.0 = Debug|Any CPU
{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|x86.ActiveCfg = Debug|Any CPU
{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|x86.Build.0 = Debug|Any CPU
{F7712928-1175-47B3-8819-EE086753DEE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F7712928-1175-47B3-8819-EE086753DEE2}.Release|Any CPU.Build.0 = Release|Any CPU
{F7712928-1175-47B3-8819-EE086753DEE2}.Release|ARM.ActiveCfg = Release|ARM
{F7712928-1175-47B3-8819-EE086753DEE2}.Release|ARM.Build.0 = Release|ARM
{F7712928-1175-47B3-8819-EE086753DEE2}.Release|ARM.ActiveCfg = Release|Any CPU
{F7712928-1175-47B3-8819-EE086753DEE2}.Release|ARM.Build.0 = Release|Any CPU
{F7712928-1175-47B3-8819-EE086753DEE2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{F7712928-1175-47B3-8819-EE086753DEE2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{F7712928-1175-47B3-8819-EE086753DEE2}.Release|x64.ActiveCfg = Release|x64
{F7712928-1175-47B3-8819-EE086753DEE2}.Release|x64.Build.0 = Release|x64
{F7712928-1175-47B3-8819-EE086753DEE2}.Release|x64.ActiveCfg = Release|Any CPU
{F7712928-1175-47B3-8819-EE086753DEE2}.Release|x64.Build.0 = Release|Any CPU
{F7712928-1175-47B3-8819-EE086753DEE2}.Release|x86.ActiveCfg = Release|Any CPU
{F7712928-1175-47B3-8819-EE086753DEE2}.Release|x86.Build.0 = Release|Any CPU
{4371944A-D3BA-4B5B-8285-82E5FFC6D1F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
......
build/Targets/VSL.Imports.targets
浏览文件 @ 7d24d820
......@@ -140,6 +140,30 @@
</ItemGroup>
</Target>
<!-- ====================================================================================
Force-include our NuGet-consumed assets into VSIX projects
NOTE: this is a very specialized behavior we need for producing the Roslyn VSIXes.
It should not be copied into other projects without careful thought and
understanding of the VSSDK VSIX targets.
==================================================================================== -->
<PropertyGroup>
<GetVsixSourceItemsDependsOn>$(GetVsixSourceItemsDependsOn);IncludeNuGetResolvedAssets</GetVsixSourceItemsDependsOn>
</PropertyGroup>
<Target Name="IncludeNuGetResolvedAssets" DependsOnTargets="ResolveNuGetPackageAssets">
<ItemGroup Condition="'$(IncludeCopyLocalReferencesInVSIXContainer)' == 'true'">
<VSIXCopyLocalReferenceSourceItem Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' != ''">
<ForceIncludeInVsix>true</ForceIncludeInVsix>
<Private>true</Private>
</VSIXCopyLocalReferenceSourceItem>
</ItemGroup>
</Target>
<!-- ====================================================================================
Generation of AssemblyVersion attributes from the BuildVersion property
......
src/VisualStudio/Setup/VisualStudioSetup.csproj
浏览文件 @ 7d24d820
......@@ -22,6 +22,7 @@
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<CopyNuGetImplementations>true</CopyNuGetImplementations>
</PropertyGroup>
<PropertyGroup Condition="'$(OfficialBuild)' == 'true'">
<DefineConstants>$(DefineConstants);OFFICIAL_BUILD</DefineConstants>
......@@ -153,8 +154,10 @@
<InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Telemetry" />
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup>
<StartAction>Program</StartAction>
......
src/VisualStudio/Setup/project.json
浏览文件 @ 7d24d820
......@@ -6,4 +6,7 @@
"frameworks": {
"net46": { }
},
"runtimes": {
"win-anycpu": { }
}
}
src/VisualStudio/Setup/project.lock.json
浏览文件 @ 7d24d820
......@@ -102,6 +102,107 @@
"lib/net46/_._": {}
}
}
},
".NETFramework,Version=v4.6/win-anycpu": {
"ManagedEsent/1.9.2": {
"compile": {
"lib/net40/Esent.Interop.dll": {}
},
"runtime": {
"lib/net40/Esent.Interop.dll": {}
}
},
"Microsoft.Composition/1.0.27": {
"compile": {
"lib/portable-net45+win8+wp8+wpa81/System.Composition.AttributedModel.dll": {},
"lib/portable-net45+win8+wp8+wpa81/System.Composition.Convention.dll": {},
"lib/portable-net45+win8+wp8+wpa81/System.Composition.Hosting.dll": {},
"lib/portable-net45+win8+wp8+wpa81/System.Composition.Runtime.dll": {},
"lib/portable-net45+win8+wp8+wpa81/System.Composition.TypedParts.dll": {}
},
"runtime": {
"lib/portable-net45+win8+wp8+wpa81/System.Composition.AttributedModel.dll": {},
"lib/portable-net45+win8+wp8+wpa81/System.Composition.Convention.dll": {},
"lib/portable-net45+win8+wp8+wpa81/System.Composition.Hosting.dll": {},
"lib/portable-net45+win8+wp8+wpa81/System.Composition.Runtime.dll": {},
"lib/portable-net45+win8+wp8+wpa81/System.Composition.TypedParts.dll": {}
}
},
"Microsoft.DiaSymReader/1.0.5": {
"compile": {
"lib/net45/Microsoft.DiaSymReader.dll": {}
},
"runtime": {
"lib/net45/Microsoft.DiaSymReader.dll": {}
}
},
"System.Collections/4.0.10": {
"compile": {
"ref/net46/_._": {}
},
"runtime": {
"lib/net46/_._": {}
}
},
"System.Collections.Immutable/1.1.36": {
"compile": {
"lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
},
"runtime": {
"lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
}
},
"System.Diagnostics.Debug/4.0.10": {
"compile": {
"ref/net46/_._": {}
},
"runtime": {
"lib/net46/_._": {}
}
},
"System.Globalization/4.0.10": {
"compile": {
"ref/net46/_._": {}
},
"runtime": {
"lib/net46/_._": {}
}
},
"System.Reflection.Metadata/1.1.0-alpha-00012": {
"dependencies": {
"System.Collections.Immutable": "[1.1.37-beta-23024, )"
},
"compile": {
"lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
},
"runtime": {
"lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
}
},
"System.Runtime/4.0.20": {
"compile": {
"ref/net46/_._": {}
},
"runtime": {
"lib/net46/_._": {}
}
},
"System.Runtime.Extensions/4.0.10": {
"compile": {
"ref/net46/_._": {}
},
"runtime": {
"lib/net46/_._": {}
}
},
"System.Threading/4.0.10": {
"compile": {
"ref/net46/_._": {}
},
"runtime": {
"lib/net46/_._": {}
}
}
}
},
"libraries": {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或