Skip to content

Commit

Permalink
Upgrade to VS 2017
Browse files Browse the repository at this point in the history
  • Loading branch information
Sidoine committed Jun 20, 2017
1 parent a52f56f commit 50c9ef3
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 100 deletions.
36 changes: 3 additions & 33 deletions Folke.Core.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.26430.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FD329597-84FE-4592-A881-C93CAEF20A5A}"
EndProject
Expand All @@ -12,17 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
global.json = global.json
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Folke.Core", "src\Folke.Core\Folke.Core.xproj", "{BF381300-69AB-4923-9B7B-F0C8814FBC26}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Folke.CsTsService", "..\Folke.CsTsService\src\Folke.CsTsService\Folke.CsTsService.xproj", "{94CA25FD-9EC5-483D-A7ED-5DB0F03D414A}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Folke.Mvc.Extensions", "..\Folke.Mvc.Extensions\src\Folke.Mvc.Extensions\Folke.Mvc.Extensions.xproj", "{FEFBB264-4B6B-40FB-9870-ED3701890973}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Folke.Elm", "..\Folke.Elm\src\Folke.Elm\Folke.Elm.xproj", "{84AEEC39-B019-4DF3-AD7B-F31A733822D2}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Folke.Identity.Elm", "..\Folke.Identity.Elm\src\Folke.Identity.Elm\Folke.Identity.Elm.xproj", "{579509D0-86D2-467D-9361-4E926219DB08}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Folke.Identity.Server", "..\Folke.Identity.Server\src\Folke.Identity.Server\Folke.Identity.Server.xproj", "{56112C86-D79A-4FE6-B23E-A1924A2B9EBA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Folke.Core", "src\Folke.Core\Folke.Core.csproj", "{BF381300-69AB-4923-9B7B-F0C8814FBC26}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -34,26 +24,6 @@ Global
{BF381300-69AB-4923-9B7B-F0C8814FBC26}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BF381300-69AB-4923-9B7B-F0C8814FBC26}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BF381300-69AB-4923-9B7B-F0C8814FBC26}.Release|Any CPU.Build.0 = Release|Any CPU
{94CA25FD-9EC5-483D-A7ED-5DB0F03D414A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{94CA25FD-9EC5-483D-A7ED-5DB0F03D414A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{94CA25FD-9EC5-483D-A7ED-5DB0F03D414A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{94CA25FD-9EC5-483D-A7ED-5DB0F03D414A}.Release|Any CPU.Build.0 = Release|Any CPU
{FEFBB264-4B6B-40FB-9870-ED3701890973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FEFBB264-4B6B-40FB-9870-ED3701890973}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FEFBB264-4B6B-40FB-9870-ED3701890973}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FEFBB264-4B6B-40FB-9870-ED3701890973}.Release|Any CPU.Build.0 = Release|Any CPU
{84AEEC39-B019-4DF3-AD7B-F31A733822D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{84AEEC39-B019-4DF3-AD7B-F31A733822D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{84AEEC39-B019-4DF3-AD7B-F31A733822D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{84AEEC39-B019-4DF3-AD7B-F31A733822D2}.Release|Any CPU.Build.0 = Release|Any CPU
{579509D0-86D2-467D-9361-4E926219DB08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{579509D0-86D2-467D-9361-4E926219DB08}.Debug|Any CPU.Build.0 = Debug|Any CPU
{579509D0-86D2-467D-9361-4E926219DB08}.Release|Any CPU.ActiveCfg = Release|Any CPU
{579509D0-86D2-467D-9361-4E926219DB08}.Release|Any CPU.Build.0 = Release|Any CPU
{56112C86-D79A-4FE6-B23E-A1924A2B9EBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{56112C86-D79A-4FE6-B23E-A1924A2B9EBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{56112C86-D79A-4FE6-B23E-A1924A2B9EBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{56112C86-D79A-4FE6-B23E-A1924A2B9EBA}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
33 changes: 2 additions & 31 deletions build.ps1
Original file line number Diff line number Diff line change
@@ -1,35 +1,6 @@
param([String]$key,[String]$version)

function setProjectVersion([String]$project, [String]$version) {
$fileName = resolve-path ".\src\$project\$project.csproj"
$content = [xml](Get-Content $fileName)
$v = $content.CreateElement("Version")
$v.set_InnerXML($version)
$content.Project.PropertyGroup.AppendChild($v)
$content.Save($fileName)
}

function publishProject([String]$project,[String]$version) {
cd ".\src\$project"
& dotnet pack -c Release
if ($LastExitCode -ne 0) {
throw "Error ($LastExitCode) during dotnet pack"
}
$file = Get-Item "bin\Release\*.$version.nupkg"
nuget push $file.FullName $key -Source https://api.nuget.org/v3/index.json
if ($LastExitCode -ne 0) {
throw "Error ($LastExitCode) during nuget push"
}
cd ..\..
}

if ($version -ne "") {
setProjectVersion "Folke.Core" $version

& dotnet restore
if ($LastExitCode -ne 0) {
throw "Error ($LastExitCode) during dotnet restore"
}

publishProject "Folke.Core" $version
nuget install Folke.Build -ExcludeVersion
& .\Folke.Build\tools\build.ps1 $key $version
}
20 changes: 20 additions & 0 deletions src/Folke.Core/Folke.Core.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>1.4.0</VersionPrefix>
<TargetFramework>netstandard1.6</TargetFramework>
<AssemblyName>Folke.Core</AssemblyName>
<PackageId>Folke.Core</PackageId>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Folke.CsTsService" Version="2.0.0.5" />
<PackageReference Include="Folke.Identity.Elm" Version="2.0.0" />
<PackageReference Include="Folke.Identity.Server" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
</ItemGroup>

</Project>
21 changes: 0 additions & 21 deletions src/Folke.Core/Folke.Core.xproj

This file was deleted.

15 changes: 0 additions & 15 deletions src/Folke.Core/project.json

This file was deleted.

0 comments on commit 50c9ef3

Please sign in to comment.