Permalink
Browse files

Add core-clr tooling (project.json, etc); still builds for same platf…

…orms - no core-clr changes
  • Loading branch information...
1 parent e45ef44 commit ad09000905c1ee798200e12d91f3370b5db87993 @mgravell mgravell committed Nov 14, 2015
Showing with 176 additions and 17 deletions.
  1. +2 −1 .gitignore
  2. +81 −0 Sigil NET45/Sigil NET45.csproj
  3. +16 −7 Sigil.sln
  4. +24 −0 Sigil/Sigil.xproj
  5. +5 −0 Sigil/global.json
  6. +39 −0 Sigil/project.json
  7. +5 −5 SigilTests/SigilTests.csproj
  8. +4 −4 TestRunner/TestRunner.csproj
View
@@ -6,4 +6,5 @@ obj/
*.user
*.suo
*.bak
-*TestResults*
+*TestResults*
+project.lock.json
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{CC8E294D-E06C-4420-A260-D515D89EC53A}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>Sigil</RootNamespace>
+ <AssemblyName>Sigil</AssemblyName>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <TargetFrameworkProfile />
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <DocumentationFile>bin\Debug\Sigil.XML</DocumentationFile>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <DocumentationFile>bin\Release\Sigil.XML</DocumentationFile>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="Microsoft.CSharp" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Net.Http" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <PropertyGroup>
+ <SignAssembly>true</SignAssembly>
+ </PropertyGroup>
+ <PropertyGroup>
+ <AssemblyOriginatorKeyFile>..\Sigil\Properties\Sigil.snk</AssemblyOriginatorKeyFile>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\Sigil\*.cs" />
+ <Compile Include="..\Sigil\Impl\*.cs">
+ <Link>Impl\%(FileName)</Link>
+ </Compile>
+ <Compile Include="..\Sigil\NonGeneric\*.cs">
+ <Link>NonGeneric\%(FileName)</Link>
+ </Compile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\Sigil\Properties\*.snk">
+ <Link>Properties\%(Filename)</Link>
+ </None>
+ <Compile Include="..\Sigil\Properties\*.cs">
+ <Link>Properties\%(Filename)</Link>
+ </Compile>
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
View
@@ -1,12 +1,13 @@

Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sigil", "Sigil\Sigil.csproj", "{6053AEAD-828C-4137-96C5-3D3CFDBE3432}"
-EndProject
+# Visual Studio 14
+VisualStudioVersion = 14.0.24606.1
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SigilTests", "SigilTests\SigilTests.csproj", "{53266E21-FEBB-4155-9937-75B909134D5E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8B252003-1909-4EA3-8BD9-2D20341F9143}"
ProjectSection(SolutionItems) = preProject
+ Sigil\global.json = Sigil\global.json
LICENSE.txt = LICENSE.txt
README.markdown = README.markdown
EndProjectSection
@@ -21,16 +22,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sigil NET30", "Sigil NET30\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sigil NET20", "Sigil NET20\Sigil NET20.csproj", "{2DBFBF4D-85B9-4785-B77E-F5635B2AE599}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sigil NET45", "Sigil NET45\Sigil NET45.csproj", "{CC8E294D-E06C-4420-A260-D515D89EC53A}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Sigil", "Sigil\Sigil.xproj", "{3F959AB7-A1C2-41DA-A1F3-981EA89A0067}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {6053AEAD-828C-4137-96C5-3D3CFDBE3432}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6053AEAD-828C-4137-96C5-3D3CFDBE3432}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6053AEAD-828C-4137-96C5-3D3CFDBE3432}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6053AEAD-828C-4137-96C5-3D3CFDBE3432}.Release|Any CPU.Build.0 = Release|Any CPU
{53266E21-FEBB-4155-9937-75B909134D5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{53266E21-FEBB-4155-9937-75B909134D5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{53266E21-FEBB-4155-9937-75B909134D5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +56,14 @@ Global
{2DBFBF4D-85B9-4785-B77E-F5635B2AE599}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2DBFBF4D-85B9-4785-B77E-F5635B2AE599}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2DBFBF4D-85B9-4785-B77E-F5635B2AE599}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CC8E294D-E06C-4420-A260-D515D89EC53A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CC8E294D-E06C-4420-A260-D515D89EC53A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CC8E294D-E06C-4420-A260-D515D89EC53A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CC8E294D-E06C-4420-A260-D515D89EC53A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3F959AB7-A1C2-41DA-A1F3-981EA89A0067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3F959AB7-A1C2-41DA-A1F3-981EA89A0067}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3F959AB7-A1C2-41DA-A1F3-981EA89A0067}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3F959AB7-A1C2-41DA-A1F3-981EA89A0067}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
View
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+ <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+ </PropertyGroup>
+ <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>3f959ab7-a1c2-41da-a1f3-981ea89a0067</ProjectGuid>
+ <RootNamespace>Sigil</RootNamespace>
+ <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+ <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup>
+ <SchemaVersion>2.0</SchemaVersion>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
+ </PropertyGroup>
+ <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
View
@@ -0,0 +1,5 @@
+{
+ "sdk": {
+ "version": "1.0.0-beta8"
+ }
+}
View
@@ -0,0 +1,39 @@
+{
+ "version": "4.5.1",
+ "description": "A fail-fast validation helper for .NET CIL generation.",
+ "authors": [ "kmontrose" ],
+ "tags": [ "cil msil il bytecode" ],
+ "projectUrl": "https://github.com/kevin-montrose/Sigil",
+ "licenseUrl": "http://opensource.org/licenses/MS-PL",
+ "releaseNotes": "tba",
+ "copyright": "2013-2015 Kevin Montrose",
+ "requireLicenseAcceptance": false,
+ "frameworks": {
+ "net20": {
+ "compilationOptions": { "define": [ "NET20" ] }
+ },
+ "net30": {
+ "compilationOptions": { "define": [ "NET30" ] }
+ },
+ "net35": {
+ "compilationOptions": { "define": [ "NET35" ] }
+ },
+ "net40": {
+ "compilationOptions": { "define": [ "NET40" ] }
+ },
+ "net45": { },
+ "dnx451": { }
+ },
+ "notYetImplemented": {
+ "dnxcore50": {
+ "compilationOptions": { "define": [ "COREFX" ] },
+ "dependencies": {
+ "Microsoft.CSharp": "4.0.1-beta-23225",
+ "System.Collections": "4.0.11-beta-23225",
+ "System.Linq": "4.0.1-beta-23225",
+ "System.Runtime": "4.0.21-beta-23225",
+ "System.Threading": "4.0.11-beta-23225"
+ }
+ }
+ }
+}
@@ -315,13 +315,13 @@
<Compile Include="WriteLine.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\Sigil\Sigil.csproj">
- <Project>{6053aead-828c-4137-96c5-3d3cfdbe3432}</Project>
- <Name>Sigil</Name>
- </ProjectReference>
+ <Compile Include="StoreArgument.cs" />
</ItemGroup>
<ItemGroup>
- <Compile Include="StoreArgument.cs" />
+ <ProjectReference Include="..\Sigil NET45\Sigil NET45.csproj">
+ <Project>{cc8e294d-e06c-4420-a260-d515d89ec53a}</Project>
+ <Name>Sigil NET45</Name>
+ </ProjectReference>
</ItemGroup>
<Choose>
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
@@ -49,14 +49,14 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\Sigil NET45\Sigil NET45.csproj">
+ <Project>{cc8e294d-e06c-4420-a260-d515d89ec53a}</Project>
+ <Name>Sigil NET45</Name>
+ </ProjectReference>
<ProjectReference Include="..\SigilTests\SigilTests.csproj">
<Project>{53266e21-febb-4155-9937-75b909134d5e}</Project>
<Name>SigilTests</Name>
</ProjectReference>
- <ProjectReference Include="..\Sigil\Sigil.csproj">
- <Project>{6053aead-828c-4137-96c5-3d3cfdbe3432}</Project>
- <Name>Sigil</Name>
- </ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

0 comments on commit ad09000

Please sign in to comment.