Skip to content

Commit

Permalink
Added support of .NET Core 1.0 RC 2
Browse files Browse the repository at this point in the history
  • Loading branch information
Taritsyn committed May 20, 2016
1 parent 3ddee85 commit 64e898a
Show file tree
Hide file tree
Showing 12 changed files with 107 additions and 97 deletions.
36 changes: 0 additions & 36 deletions DouglasCrockford.JsMin.Dnx.sln

This file was deleted.

41 changes: 41 additions & 0 deletions DouglasCrockford.JsMin.DotNet.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B9F90C7A-C39E-48AA-B959-0C163ABFDED3}"
ProjectSection(SolutionItems) = preProject
global.json = global.json
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{06134ABE-D9A1-4D4D-9DBB-9187A4709227}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{67E56EE9-75BA-4CDE-8F7A-CDFCC1FC4447}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DouglasCrockford.JsMin", "src\DouglasCrockford.JsMin\DouglasCrockford.JsMin.xproj", "{6043ADBE-EA02-45F2-AB24-1683E367DD88}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DouglasCrockford.JsMin.Test", "test\DouglasCrockford.JsMin.Test\DouglasCrockford.JsMin.Test.xproj", "{07D76AA7-017F-4E75-A180-08E620F1B17A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{6043ADBE-EA02-45F2-AB24-1683E367DD88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6043ADBE-EA02-45F2-AB24-1683E367DD88}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6043ADBE-EA02-45F2-AB24-1683E367DD88}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6043ADBE-EA02-45F2-AB24-1683E367DD88}.Release|Any CPU.Build.0 = Release|Any CPU
{07D76AA7-017F-4E75-A180-08E620F1B17A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{07D76AA7-017F-4E75-A180-08E620F1B17A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{07D76AA7-017F-4E75-A180-08E620F1B17A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{07D76AA7-017F-4E75-A180-08E620F1B17A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{6043ADBE-EA02-45F2-AB24-1683E367DD88} = {06134ABE-D9A1-4D4D-9DBB-9187A4709227}
{07D76AA7-017F-4E75-A180-08E620F1B17A} = {67E56EE9-75BA-4CDE-8F7A-CDFCC1FC4447}
EndGlobalSection
EndGlobal
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"projects": [ "src", "test" ],
"sdk": {
"version": "1.0.0-rc1-final",
"runtime": "clr",
"version": "1.0.0-preview1-002702",
"runtime": "coreclr",
"architecture": "x86"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>..\..\JSMin.NET.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\tools\Key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand All @@ -46,8 +46,8 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\JSMin.NET.snk">
<Link>JSMin.NET.snk</Link>
<None Include="..\..\tools\Key.snk">
<Link>Key.snk</Link>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
19 changes: 9 additions & 10 deletions src/DouglasCrockford.JsMin/DouglasCrockford.JsMin.xproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,18 @@
<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)' != ''" />

<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>eeedf33a-df5c-4a49-8405-59acd6d00dd7</ProjectGuid>
<ProjectGuid>6043adbe-ea02-45f2-ab24-1683e367dd88</ProjectGuid>
<RootNamespace>DouglasCrockford.JsMin</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>

<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
<TypeScriptCompileBlocked>True</TypeScriptCompileBlocked>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
2 changes: 1 addition & 1 deletion src/DouglasCrockford.JsMin/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[assembly: AssemblyCulture("")]

[assembly: ComVisible(false)]
#if !DOTNET5_4
#if !NETSTANDARD1_0
[assembly: Guid("0d7b205c-e3d6-4756-9977-29a71052536b")]
#endif

Expand Down
30 changes: 16 additions & 14 deletions src/DouglasCrockford.JsMin/project.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
{
"version": "1.1.0-rc1",
"description": "",
"authors": [ "" ],
"tags": [ "" ],
"projectUrl": "",
"licenseUrl": "",
"version": "1.1.0-rc2",

"compilationOptions": {
"keyFile": "../../JSMin.NET.snk"
},
"dependencies": { },

"frameworks": {
"net451": { },
"dotnet5.4": {
"netstandard1.0": {
"dependencies": {
"System.IO": "4.0.11-beta-23516",
"System.Runtime": "4.0.21-beta-23516",
"System.Threading": "4.0.11-beta-23516"
"System.IO": "4.1.0-rc2-24027",
"System.Runtime": "4.1.0-rc2-24027",
"System.Threading": "4.0.11-rc2-24027"
}
}
},

"buildOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"nowarn": [
"CS1591"
],
"xmlDoc": true
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Expand Down
18 changes: 6 additions & 12 deletions test/DouglasCrockford.JsMin.Test/DouglasCrockford.JsMin.Test.xproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,19 @@
<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)' != ''" />
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>650a5a85-5956-491e-9312-5e25a27d1108</ProjectGuid>
<ProjectGuid>07d76aa7-017f-4e75-a180-08e620f1b17a</ProjectGuid>
<RootNamespace>DouglasCrockford.JsMin.Test</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
<TypeScriptCompileBlocked>True</TypeScriptCompileBlocked>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
</PropertyGroup>
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
<ItemGroup>
<DnxInvisibleContent Include="packages.config" />
</ItemGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[assembly: AssemblyCulture("")]

[assembly: ComVisible(false)]
#if !DNXCORE50
#if !NETCOREAPP1_0
[assembly: Guid("72947ee4-f2b3-42e9-a84b-9a4a5254e974")]
#endif

Expand Down
41 changes: 24 additions & 17 deletions test/DouglasCrockford.JsMin.Test/project.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,34 @@
{
"version": "1.1.0-rc1",
"description": "",
"authors": [ "" ],
"tags": [ "" ],
"projectUrl": "",
"licenseUrl": "",

"tooling": {
"defaultNamespace": "<%= namespace %>"
},
"version": "1.1.0-rc2",

"dependencies": {
"dotnet-test-xunit": "1.0.0-rc2-build10015",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-final",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
"xunit": "2.1.0",
"xunit.runner.dnx": "2.1.0-rc1-build204",
"DouglasCrockford.JsMin": "1.1.0-rc1"
"DouglasCrockford.JsMin": "1.1.0-rc2"
},

"commands": {
"test": "xunit.runner.dnx"
},
"testRunner": "xunit",

"frameworks": {
"dnx451": { },
"dnxcore50": { }
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-3002702",
"type": "platform"
}
}
}
},

"buildOptions": {
"warningsAsErrors": true,
"emitEntryPoint": false
}
}
File renamed without changes.

0 comments on commit 64e898a

Please sign in to comment.