paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more target frameworks

Browse Source
This commit is contained in:
Paul Schneider
2018-06-27 17:00:05 +02:00
parent fea84e2df7
commit 4257a65918
11 changed files with 7344 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OAuth.AspNet.Token/project.lock.json
View File

@ -1695,7 +1695,7 @@
"Microsoft.Extensions.PlatformAbstractions/1.0.0-rc1-final": { "Microsoft.Extensions.PlatformAbstractions/1.0.0-rc1-final": {
"type": "package", "type": "package",
"serviceable": true, "serviceable": true,
"sha512": "26HS4c6MBisN+D7XUr8HObOI/JJvSJQYQR//Bfw/hi9UqhqK3lFpNKjOuYHI+gTxYdXT46HqZiz4D+k7d+ob3A==", "sha512": "0b65CFB9nCxENPDjoOGeNaQBK1jhKfjQVcHg2KTWvPr+GaaBNyqmAo+7H+1ZoH6hmEYYl63aEbB1HXPRD4eQlQ==",
"files": [ "files": [
"lib/dotnet5.4/Microsoft.Extensions.PlatformAbstractions.dll", "lib/dotnet5.4/Microsoft.Extensions.PlatformAbstractions.dll",
"lib/dotnet5.4/Microsoft.Extensions.PlatformAbstractions.xml", "lib/dotnet5.4/Microsoft.Extensions.PlatformAbstractions.xml",

10
Yavsc.Abstract/project.json
View File

@ -42,6 +42,16 @@
"System.ComponentModel.DataAnnotations": "4.0.0" "System.ComponentModel.DataAnnotations": "4.0.0"
} }
}, },
"net461": {
"frameworkAssemblies": {
"System.ComponentModel.DataAnnotations": "4.0.0"
}
},
"net452": {
"frameworkAssemblies": {
"System.ComponentModel.DataAnnotations": "4.0.0"
}
},
"net451": { "net451": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.ComponentModel.DataAnnotations": "4.0.0" "System.ComponentModel.DataAnnotations": "4.0.0"

72
Yavsc.Abstract/project.lock.json
View File

@ -24,6 +24,28 @@
} }
} }
}, },
".NETFramework,Version=v4.6.1": {
"Newtonsoft.Json/9.0.1": {
"type": "package",
"compile": {
"lib/net45/Newtonsoft.Json.dll": {}
},
"runtime": {
"lib/net45/Newtonsoft.Json.dll": {}
}
}
},
".NETFramework,Version=v4.5.2": {
"Newtonsoft.Json/9.0.1": {
"type": "package",
"compile": {
"lib/net45/Newtonsoft.Json.dll": {}
},
"runtime": {
"lib/net45/Newtonsoft.Json.dll": {}
}
}
},
".NETFramework,Version=v4.5.1": { ".NETFramework,Version=v4.5.1": {
"Newtonsoft.Json/9.0.1": { "Newtonsoft.Json/9.0.1": {
"type": "package", "type": "package",
@ -79,6 +101,50 @@
} }
} }
}, },
".NETFramework,Version=v4.6.1/debian.9-x86": {
"Newtonsoft.Json/9.0.1": {
"type": "package",
"compile": {
"lib/net45/Newtonsoft.Json.dll": {}
},
"runtime": {
"lib/net45/Newtonsoft.Json.dll": {}
}
}
},
".NETFramework,Version=v4.6.1/debian.9-x64": {
"Newtonsoft.Json/9.0.1": {
"type": "package",
"compile": {
"lib/net45/Newtonsoft.Json.dll": {}
},
"runtime": {
"lib/net45/Newtonsoft.Json.dll": {}
}
}
},
".NETFramework,Version=v4.5.2/debian.9-x86": {
"Newtonsoft.Json/9.0.1": {
"type": "package",
"compile": {
"lib/net45/Newtonsoft.Json.dll": {}
},
"runtime": {
"lib/net45/Newtonsoft.Json.dll": {}
}
}
},
".NETFramework,Version=v4.5.2/debian.9-x64": {
"Newtonsoft.Json/9.0.1": {
"type": "package",
"compile": {
"lib/net45/Newtonsoft.Json.dll": {}
},
"runtime": {
"lib/net45/Newtonsoft.Json.dll": {}
}
}
},
".NETFramework,Version=v4.5.1/debian.9-x86": { ".NETFramework,Version=v4.5.1/debian.9-x86": {
"Newtonsoft.Json/9.0.1": { "Newtonsoft.Json/9.0.1": {
"type": "package", "type": "package",
@ -138,6 +204,12 @@
".NETFramework,Version=v4.6": [ ".NETFramework,Version=v4.6": [
"fx/System.ComponentModel.DataAnnotations >= 4.0.0" "fx/System.ComponentModel.DataAnnotations >= 4.0.0"
], ],
".NETFramework,Version=v4.6.1": [
"fx/System.ComponentModel.DataAnnotations >= 4.0.0"
],
".NETFramework,Version=v4.5.2": [
"fx/System.ComponentModel.DataAnnotations >= 4.0.0"
],
".NETFramework,Version=v4.5.1": [ ".NETFramework,Version=v4.5.1": [
"fx/System.ComponentModel.DataAnnotations >= 4.0.0" "fx/System.ComponentModel.DataAnnotations >= 4.0.0"
] ]

12
Yavsc.Server/Yavsc.Server.csproj
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<Description>Yavsc server common library</Description> <Description>Yavsc server common library</Description>
<VersionPrefix>1.0.5</VersionPrefix> <VersionPrefix>1.0.5</VersionPrefix>
@ -17,16 +17,13 @@
<RepositoryType>git</RepositoryType> <RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/pazof/yavsc</RepositoryUrl> <RepositoryUrl>https://github.com/pazof/yavsc</RepositoryUrl>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="wwwroot;node_modules;bower_components;contrib" /> <Compile Remove="wwwroot;node_modules;bower_components;contrib" />
<EmbeddedResource Include="Resources\**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" /> <EmbeddedResource Include="Resources\**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="../Yavsc.Abstract/Yavsc.Abstract.csproj" /> <ProjectReference Include="../Yavsc.Abstract/Yavsc.Abstract.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EntityFramework.Commands" Version="7.0.0-rc1-final" /> <PackageReference Include="EntityFramework.Commands" Version="7.0.0-rc1-final" />
<PackageReference Include="Microsoft.AspNet.Identity.EntityFramework" Version="3.0.0-rc1-*" /> <PackageReference Include="Microsoft.AspNet.Identity.EntityFramework" Version="3.0.0-rc1-*" />
@ -49,7 +46,6 @@
<PackageReference Include="MailKit" Version="1.12.0" /> <PackageReference Include="MailKit" Version="1.12.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="1.3.0" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="1.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'dnx451' "> <ItemGroup Condition=" '$(TargetFramework)' == 'dnx451' ">
<Reference Include="System.Json" /> <Reference Include="System.Json" />
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
@ -60,7 +56,6 @@
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Json" /> <Reference Include="System.Json" />
@ -70,7 +65,6 @@
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Json" /> <Reference Include="System.Json" />
@ -79,6 +73,6 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Content Include="Models\IT\Project.cs" />
</ItemGroup> </ItemGroup>
</Project>
</Project>

22
Yavsc.Server/project.json
View File

@ -90,6 +90,16 @@
"System": "4.0.0" "System": "4.0.0"
} }
}, },
"net452": {
"frameworkAssemblies": {
"System.ComponentModel.DataAnnotations": "4.0.0",
"System.Json": "4.0.0",
"System.Net": "4.0.0.0",
"System.Net.Http": "4.0.0",
"System.Xml": "4.0.0",
"System": "4.0.0"
}
},
"net46": { "net46": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.ComponentModel.DataAnnotations": "4.0.0", "System.ComponentModel.DataAnnotations": "4.0.0",
@ -99,10 +109,20 @@
"System.Xml": "4.0.0", "System.Xml": "4.0.0",
"System": "4.0.0" "System": "4.0.0"
} }
},
"net461": {
"frameworkAssemblies": {
"System.ComponentModel.DataAnnotations": "4.0.0",
"System.Json": "4.0.0",
"System.Net": "4.0.0.0",
"System.Net.Http": "4.0.0",
"System.Xml": "4.0.0",
"System": "4.0.0"
}
} }
}, },
"commands": { "commands": {
"ef": "EntityFramework.Commands", "ef": "EntityFramework.Commands",
"gen": "Microsoft.Extensions.CodeGeneration" "gen": "Microsoft.Extensions.CodeGeneration"
} }
} }

7222
Yavsc.Server/project.lock.json
View File

File diff suppressed because it is too large Load Diff

16
Yavsc/Yavsc.csproj
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<Description>encore une très petite entreprise</Description> <Description>encore une très petite entreprise</Description>
<VersionPrefix>1.0.5</VersionPrefix> <VersionPrefix>1.0.5</VersionPrefix>
@ -17,7 +17,6 @@
<RepositoryType>git</RepositoryType> <RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/pazof/yavsc</RepositoryUrl> <RepositoryUrl>https://github.com/pazof/yavsc</RepositoryUrl>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="wwwroot\**\*;node_modules\**\*;bower_components\**\*;contrib\**\*" /> <Compile Remove="wwwroot\**\*;node_modules\**\*;bower_components\**\*;contrib\**\*" />
<EmbeddedResource Include="Resources\**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" /> <EmbeddedResource Include="Resources\**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
@ -25,14 +24,12 @@
<CopyToPublishDirectory>Never</CopyToPublishDirectory> <CopyToPublishDirectory>Never</CopyToPublishDirectory>
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="../OAuth.AspNet.Token/OAuth.AspNet.Token.csproj" /> <ProjectReference Include="../OAuth.AspNet.Token/OAuth.AspNet.Token.csproj" />
<ProjectReference Include="../OAuth.AspNet.AuthServer/OAuth.AspNet.AuthServer.csproj" /> <ProjectReference Include="../OAuth.AspNet.AuthServer/OAuth.AspNet.AuthServer.csproj" />
<ProjectReference Include="../Yavsc.Abstract/Yavsc.Abstract.csproj" /> <ProjectReference Include="../Yavsc.Abstract/Yavsc.Abstract.csproj" />
<ProjectReference Include="../Yavsc.Server/Yavsc.Server.csproj" /> <ProjectReference Include="../Yavsc.Server/Yavsc.Server.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EntityFramework.Commands" Version="7.0.0-rc1-final" /> <PackageReference Include="EntityFramework.Commands" Version="7.0.0-rc1-final" />
<PackageReference Include="EntityFramework.Core" Version="7.0.0-rc1-final" /> <PackageReference Include="EntityFramework.Core" Version="7.0.0-rc1-final" />
@ -95,17 +92,20 @@
<PackageReference Include="PayPalMerchant-net451" Version="2.7.109" /> <PackageReference Include="PayPalMerchant-net451" Version="2.7.109" />
<PackageReference Include="Gapi.net45" Version="1.0.0" /> <PackageReference Include="Gapi.net45" Version="1.0.0" />
</ItemGroup> </ItemGroup>
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish"> <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
<Exec Command="gulp min" /> <Exec Command="gulp min" />
</Target> </Target>
<ItemGroup Condition=" '$(TargetFramework)' == 'dnx451' "> <ItemGroup Condition=" '$(TargetFramework)' == 'dnx451' ">
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net" /> <Reference Include="System.Net" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Content Include="Controllers\ProjectController.cs" />
<Content Include="Controllers\PeriodController.cs" />
<Content Include="Views\Project\Index.cshtml" />
<Content Include="Views\Project\Create.cshtml" />
<Content Include="Helpers\PageHelpers.cs" />
<Content Include="Migrations\20180625113528_Git.cs" />
</ItemGroup> </ItemGroup>
</Project>
</Project>

0
Yavsc/Yavsc.csproj' Normal file
View File

5
Yavsc/project.json
View File

@ -97,7 +97,6 @@
"Microsoft.AspNet.Session": "1.0.0-rc1-final", "Microsoft.AspNet.Session": "1.0.0-rc1-final",
"Microsoft.AspNet.Web.Optimization": "1.1.3", "Microsoft.AspNet.Web.Optimization": "1.1.3",
"Microsoft.AspNet.Http.Extensions": "1.0.0-rc1-final", "Microsoft.AspNet.Http.Extensions": "1.0.0-rc1-final",
"Microsoft.AspNet.Authentication.JwtBearer": "1.0.0-rc1-final",
"Microsoft.AspNet.DataProtection": "1.0.0-rc1-final", "Microsoft.AspNet.DataProtection": "1.0.0-rc1-final",
"Microsoft.AspNet.DataProtection.SystemWeb": "1.0.0-rc1-final", "Microsoft.AspNet.DataProtection.SystemWeb": "1.0.0-rc1-final",
"Microsoft.AspNet.Authentication.OAuth": "1.0.0-rc1-final", "Microsoft.AspNet.Authentication.OAuth": "1.0.0-rc1-final",
@ -158,9 +157,7 @@
"System.Net": "4.0.0.0", "System.Net": "4.0.0.0",
"System.Xml": "4.0.0.0", "System.Xml": "4.0.0.0",
"System": "4.0.0.0" "System": "4.0.0.0"
}, }
"net451": {},
"net46": {}
} }
}, },
"publishOptions": { "publishOptions": {

8
testOauthClient/Dockerfile
View File

@ -1,8 +1,8 @@
FROM microsoft/aspnet:1.0.0-rc1-update1 FROM microsoft/aspnet:1.0.0-rc1-update2
RUN printf "deb http://ftp.us.debian.org/debian jessie main\n" >> /etc/apt/sources.list
RUN apt-get -qq update && apt-get install -qqy sqlite3 libsqlite3-dev && rm -rf /var/lib/apt/lists/*
RUN printf "deb http://ftp2.fr.debian.org/debian/ stable main contrib non-free\n" >> /etc/apt/sources.list
# RUN apt-get -qq update && apt-get install -qqy sqlite3 libsqlite3-dev && rm -rf /var/lib/apt/lists/*
RUN apt-get -qq update && apt-get install -qqy postgresql-9.5 postgresql-client-9.5 && rm -rf /var/lib/apt/lists/*
COPY . /app COPY . /app
WORKDIR /app WORKDIR /app
RUN ["dnu", "restore"] RUN ["dnu", "restore"]

3
testOauthClient/project.json
View File

@ -40,7 +40,8 @@
"System.Json": "4.0.20126.16343" "System.Json": "4.0.20126.16343"
} }
}, },
"net451": {} "net451": {},
".NETFramework,Version=v4.5.1": {}
}, },
"exclude": [ "exclude": [
"wwwroot", "wwwroot",