Skip to content

Commit 64e898a

Browse files
TaritsynTaritsyn
committed
Added support of .NET Core 1.0 RC 2
1 parent 3ddee85 commit 64e898a

12 files changed

Lines changed: 107 additions & 97 deletions

‎DouglasCrockford.JsMin.Dnx.sln‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎DouglasCrockford.JsMin.DotNet.sln‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25123.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B9F90C7A-C39E-48AA-B959-0C163ABFDED3}"
7+
ProjectSection(SolutionItems) = preProject
8+
global.json = global.json
9+
EndProjectSection
10+
EndProject
11+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{06134ABE-D9A1-4D4D-9DBB-9187A4709227}"
12+
EndProject
13+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{67E56EE9-75BA-4CDE-8F7A-CDFCC1FC4447}"
14+
EndProject
15+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DouglasCrockford.JsMin", "src\DouglasCrockford.JsMin\DouglasCrockford.JsMin.xproj", "{6043ADBE-EA02-45F2-AB24-1683E367DD88}"
16+
EndProject
17+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DouglasCrockford.JsMin.Test", "test\DouglasCrockford.JsMin.Test\DouglasCrockford.JsMin.Test.xproj", "{07D76AA7-017F-4E75-A180-08E620F1B17A}"
18+
EndProject
19+
Global
20+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
21+
Debug|Any CPU = Debug|Any CPU
22+
Release|Any CPU = Release|Any CPU
23+
EndGlobalSection
24+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
25+
{6043ADBE-EA02-45F2-AB24-1683E367DD88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26+
{6043ADBE-EA02-45F2-AB24-1683E367DD88}.Debug|Any CPU.Build.0 = Debug|Any CPU
27+
{6043ADBE-EA02-45F2-AB24-1683E367DD88}.Release|Any CPU.ActiveCfg = Release|Any CPU
28+
{6043ADBE-EA02-45F2-AB24-1683E367DD88}.Release|Any CPU.Build.0 = Release|Any CPU
29+
{07D76AA7-017F-4E75-A180-08E620F1B17A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30+
{07D76AA7-017F-4E75-A180-08E620F1B17A}.Debug|Any CPU.Build.0 = Debug|Any CPU
31+
{07D76AA7-017F-4E75-A180-08E620F1B17A}.Release|Any CPU.ActiveCfg = Release|Any CPU
32+
{07D76AA7-017F-4E75-A180-08E620F1B17A}.Release|Any CPU.Build.0 = Release|Any CPU
33+
EndGlobalSection
34+
GlobalSection(SolutionProperties) = preSolution
35+
HideSolutionNode = FALSE
36+
EndGlobalSection
37+
GlobalSection(NestedProjects) = preSolution
38+
{6043ADBE-EA02-45F2-AB24-1683E367DD88} = {06134ABE-D9A1-4D4D-9DBB-9187A4709227}
39+
{07D76AA7-017F-4E75-A180-08E620F1B17A} = {67E56EE9-75BA-4CDE-8F7A-CDFCC1FC4447}
40+
EndGlobalSection
41+
EndGlobal

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"projects": [ "src", "test" ],
33
"sdk": {
4-
"version": "1.0.0-rc1-final",
5-
"runtime": "clr",
4+
"version": "1.0.0-preview1-002702",
5+
"runtime": "coreclr",
66
"architecture": "x86"
77
}
8-
}
8+
}

‎src/DouglasCrockford.JsMin/DouglasCrockford.JsMin.Net40.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<SignAssembly>true</SignAssembly>
3535
</PropertyGroup>
3636
<PropertyGroup>
37-
<AssemblyOriginatorKeyFile>..\..\JSMin.NET.snk</AssemblyOriginatorKeyFile>
37+
<AssemblyOriginatorKeyFile>..\..\tools\Key.snk</AssemblyOriginatorKeyFile>
3838
</PropertyGroup>
3939
<ItemGroup>
4040
<Reference Include="System" />
@@ -46,8 +46,8 @@
4646
<Compile Include="Properties\AssemblyInfo.cs" />
4747
</ItemGroup>
4848
<ItemGroup>
49-
<None Include="..\..\JSMin.NET.snk">
50-
<Link>JSMin.NET.snk</Link>
49+
<None Include="..\..\tools\Key.snk">
50+
<Link>Key.snk</Link>
5151
</None>
5252
</ItemGroup>
5353
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎src/DouglasCrockford.JsMin/DouglasCrockford.JsMin.xproj‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,18 @@
44
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
55
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
66
</PropertyGroup>
7-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
7+
8+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
89
<PropertyGroup Label="Globals">
9-
<ProjectGuid>eeedf33a-df5c-4a49-8405-59acd6d00dd7</ProjectGuid>
10+
<ProjectGuid>6043adbe-ea02-45f2-ab24-1683e367dd88</ProjectGuid>
1011
<RootNamespace>DouglasCrockford.JsMin</RootNamespace>
11-
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
12-
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
12+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
13+
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
14+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1315
</PropertyGroup>
16+
1417
<PropertyGroup>
1518
<SchemaVersion>2.0</SchemaVersion>
16-
<TypeScriptCompileBlocked>True</TypeScriptCompileBlocked>
1719
</PropertyGroup>
18-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
19-
<ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
20-
</PropertyGroup>
21-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
22-
</Project>
20+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
21+
</Project>

‎src/DouglasCrockford.JsMin/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
[assembly: AssemblyCulture("")]
1212

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

‎src/DouglasCrockford.JsMin/project.json‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
{
2-
"version": "1.1.0-rc1",
3-
"description": "",
4-
"authors": [ "" ],
5-
"tags": [ "" ],
6-
"projectUrl": "",
7-
"licenseUrl": "",
2+
"version": "1.1.0-rc2",
83

9-
"compilationOptions": {
10-
"keyFile": "../../JSMin.NET.snk"
11-
},
4+
"dependencies": { },
125

136
"frameworks": {
147
"net451": { },
15-
"dotnet5.4": {
8+
"netstandard1.0": {
169
"dependencies": {
17-
"System.IO": "4.0.11-beta-23516",
18-
"System.Runtime": "4.0.21-beta-23516",
19-
"System.Threading": "4.0.11-beta-23516"
10+
"System.IO": "4.1.0-rc2-24027",
11+
"System.Runtime": "4.1.0-rc2-24027",
12+
"System.Threading": "4.0.11-rc2-24027"
2013
}
2114
}
15+
},
16+
17+
"buildOptions": {
18+
"warningsAsErrors": true,
19+
"keyFile": "../../tools/Key.snk",
20+
"nowarn": [
21+
"CS1591"
22+
],
23+
"xmlDoc": true
2224
}
23-
}
25+
}

‎test/DouglasCrockford.JsMin.Test/DouglasCrockford.JsMin.Test.Net45.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@
6969
<ItemGroup>
7070
<None Include="packages.config" />
7171
</ItemGroup>
72+
<ItemGroup>
73+
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
74+
</ItemGroup>
7275
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7376
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
7477
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

‎test/DouglasCrockford.JsMin.Test/DouglasCrockford.JsMin.Test.xproj‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,19 @@
44
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
55
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
66
</PropertyGroup>
7-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
7+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
88
<PropertyGroup Label="Globals">
9-
<ProjectGuid>650a5a85-5956-491e-9312-5e25a27d1108</ProjectGuid>
9+
<ProjectGuid>07d76aa7-017f-4e75-a180-08e620f1b17a</ProjectGuid>
1010
<RootNamespace>DouglasCrockford.JsMin.Test</RootNamespace>
11-
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
12-
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
11+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
12+
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1314
</PropertyGroup>
1415
<PropertyGroup>
1516
<SchemaVersion>2.0</SchemaVersion>
16-
<TypeScriptCompileBlocked>True</TypeScriptCompileBlocked>
1717
</PropertyGroup>
18-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
19-
<ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
20-
</PropertyGroup>
21-
<ItemGroup>
22-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
23-
</ItemGroup>
2418
<ItemGroup>
2519
<DnxInvisibleContent Include="packages.config" />
2620
</ItemGroup>
27-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
21+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
2822
</Project>

‎test/DouglasCrockford.JsMin.Test/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
[assembly: AssemblyCulture("")]
1212

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

0 commit comments

Comments
 (0)