Browse Source

Revert the addition of ICSharpCode.Decompiler.netstd.csproj

pull/836/head
Sam Harwell 8 years ago
parent
commit
1eaa8743c5
  1. 6
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
  2. 56
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.netstd.csproj
  3. 15
      ILSpy.sln

6
ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj

@ -546,17 +546,13 @@ @@ -546,17 +546,13 @@
<LastGenOutput>Instructions.cs</LastGenOutput>
</None>
<None Include="packages.config" />
<None Include="Properties\AssemblyInfo.template.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\cecil\Mono.Cecil.csproj">
<Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
<Name>Mono.Cecil</Name>
</ProjectReference>
<ProjectReference Include="ICSharpCode.Decompiler.netstd.csproj">
<Project>{fd56f486-a0c3-4469-b6d3-d2bae23ce2a0}</Project>
<Name>ICSharpCode.Decompiler.netstd</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />

56
ICSharpCode.Decompiler/ICSharpCode.Decompiler.netstd.csproj

@ -1,56 +0,0 @@ @@ -1,56 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>ICSharpCode.Decompiler</AssemblyName>
<RootNamespace>ICSharpCode.Decompiler</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>ICSharpCode.Decompiler.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Ast\**" />
<EmbeddedResource Remove="Ast\**" />
<None Remove="Ast\**" />
</ItemGroup>
<ItemGroup>
<Compile Remove="CodeMappings.cs" />
<Compile Remove="CSharp\Transforms\CombineQueryExpressions.cs" />
<Compile Remove="CSharp\Transforms\ExpressionTreeConverter.cs" />
<Compile Remove="CSharp\Transforms\FlattenSwitchBlocks.cs" />
<Compile Remove="CSharp\Transforms\IntroduceQueryExpressions.cs" />
<Compile Remove="DecompilerException.cs" />
<Compile Remove="Properties\AssemblyInfo.template.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\cecil\Mono.Cecil.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
<PropertyGroup>
<UpdateAssemblyInfo>UpdateAssemblyInfo.exe</UpdateAssemblyInfo>
<UpdateAssemblyInfo Condition="$(OS)=='Unix'">mono $(UpdateAssemblyInfo)</UpdateAssemblyInfo>
</PropertyGroup>
<MSBuild Projects="$(MSBuildProjectDirectory)\..\BuildTools\UpdateAssemblyInfo\UpdateAssemblyInfo.csproj" Targets="Build" Properties="Configuration=Debug" />
<Exec WorkingDirectory="$(MSBuildProjectDirectory)\..\BuildTools\UpdateAssemblyInfo\bin\Debug" Command="$(UpdateAssemblyInfo) --branchname $(BranchName)" Timeout="60000" Condition=" '$(BranchName)' != '' " />
<Exec WorkingDirectory="$(MSBuildProjectDirectory)\..\BuildTools\UpdateAssemblyInfo\bin\Debug" Command="$(UpdateAssemblyInfo)" Timeout="60000" Condition=" '$(BranchName)' == '' " />
</Target>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="del /F /S /Q $(ProjectDir)\obj" />
</Target>
</Project>

15
ILSpy.sln

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.12
VisualStudioVersion = 15.0.25920.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{F45DB999-7E72-4000-B5AD-3A7B485A0896}"
ProjectSection(SolutionItems) = preProject
@ -35,8 +35,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution @@ -35,8 +35,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Rebracer.xml = Rebracer.xml
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler.netstd", "ICSharpCode.Decompiler\ICSharpCode.Decompiler.netstd.csproj", "{FD56F486-A0C3-4469-B6D3-D2BAE23CE2A0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -123,19 +121,8 @@ Global @@ -123,19 +121,8 @@ Global
{9D7BE6C0-B7B3-4A50-A54E-18A2D84A3384}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9D7BE6C0-B7B3-4A50-A54E-18A2D84A3384}.Release|Any CPU.Build.0 = Release|Any CPU
{9D7BE6C0-B7B3-4A50-A54E-18A2D84A3384}.Release|x86.ActiveCfg = Release|Any CPU
{FD56F486-A0C3-4469-B6D3-D2BAE23CE2A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD56F486-A0C3-4469-B6D3-D2BAE23CE2A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD56F486-A0C3-4469-B6D3-D2BAE23CE2A0}.Debug|x86.ActiveCfg = Debug|Any CPU
{FD56F486-A0C3-4469-B6D3-D2BAE23CE2A0}.Debug|x86.Build.0 = Debug|Any CPU
{FD56F486-A0C3-4469-B6D3-D2BAE23CE2A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD56F486-A0C3-4469-B6D3-D2BAE23CE2A0}.Release|Any CPU.Build.0 = Release|Any CPU
{FD56F486-A0C3-4469-B6D3-D2BAE23CE2A0}.Release|x86.ActiveCfg = Release|Any CPU
{FD56F486-A0C3-4469-B6D3-D2BAE23CE2A0}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9DC5EDAF-8473-4E6C-A4BB-584496ACDD44}
EndGlobalSection
EndGlobal

Loading…
Cancel
Save