X Tutup
Skip to content

Commit abc5951

Browse files
committed
Build stuff
* Remove aspnetcidev myget feed, we don't want to get rc3 packages from there for now. * Removed runtimes section from project.json, was necessary to get VS to build. Added <CopyNuGetImplementations> to csproj instead.
1 parent dca6fd4 commit abc5951

File tree

11 files changed

+18
-19
lines changed

11 files changed

+18
-19
lines changed

NuGet.Config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@
66
<packageSources>
77
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
88
<add key="AspNetRelease" value="https://www.myget.org/F/aspnetrelease/api/v3/index.json" />
9-
<add key="AspNetVNext" value="https://www.myget.org/F/aspnetcidev/api/v3/index.json" />
109
</packageSources>
1110
</configuration>

src/EntityFramework5.Npgsql/EntityFramework5.Npgsql.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
<TargetFrameworkProfile />
1717
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
1818
<LangVersion>5</LangVersion>
19+
<!-- The following stops VS from complaining about runtimes in project.json, see
20+
https://github.com/Microsoft/msbuild/issues/394 -->
21+
<CopyNuGetImplementations>false</CopyNuGetImplementations>
1922
</PropertyGroup>
2023
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2124
<DebugSymbols>true</DebugSymbols>

src/EntityFramework5.Npgsql/project.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
"compilationOptions": {
3131
"keyFile": "../../Npgsql.snk"
3232
},
33-
"runtimes": {
34-
"win": {}
35-
},
3633
"dependencies" : {
3734
"Npgsql": "3.1.0-*"
3835
},

src/EntityFramework6.Npgsql/EntityFramework6.Npgsql.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
<RestorePackages>true</RestorePackages>
1616
<TargetFrameworkProfile />
1717
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
18+
<!-- The following stops VS from complaining about runtimes in project.json, see
19+
https://github.com/Microsoft/msbuild/issues/394 -->
20+
<CopyNuGetImplementations>false</CopyNuGetImplementations>
1821
</PropertyGroup>
1922
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2023
<DebugSymbols>true</DebugSymbols>

src/EntityFramework6.Npgsql/project.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@
3131
"define": [ "ENTITIES6" ],
3232
"keyFile": "../../Npgsql.snk"
3333
},
34-
"runtimes": {
35-
"win": {}
36-
},
3734
"dependencies" : {
3835
"EntityFramework": "6.1.3",
3936
"Npgsql": "3.1.0-*"

src/Npgsql/Npgsql.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
</NuGetPackageImportStamp>
1919
<TargetFrameworkProfile />
2020
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
21+
<!-- The following stops VS from complaining about runtimes in project.json, see
22+
https://github.com/Microsoft/msbuild/issues/394 -->
23+
<CopyNuGetImplementations>false</CopyNuGetImplementations>
2124
</PropertyGroup>
2225
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2326
<DebugSymbols>true</DebugSymbols>
@@ -300,4 +303,4 @@
300303
<EmbeddedResource Include="NpgsqlMetaData.xml" />
301304
</ItemGroup>
302305
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
303-
</Project>
306+
</Project>

src/Npgsql/project.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@
3737
"tools": {
3838
"dotnet-rewrite-async": "0.8.2"
3939
},
40-
"runtimes": {
41-
"win": {}
42-
},
4340
"frameworks": {
4441
"net45": {
4542
"frameworkAssemblies": {

test/EntityFramework6.Npgsql.Tests/EntityFramework6.Npgsql.Tests.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
<RestorePackages>true</RestorePackages>
1414
<TargetFrameworkProfile />
1515
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
16+
<!-- The following stops VS from complaining about runtimes in project.json, see
17+
https://github.com/Microsoft/msbuild/issues/394 -->
18+
<CopyNuGetImplementations>false</CopyNuGetImplementations>
1619
</PropertyGroup>
1720
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1821
<OutputPath>bin\Debug\</OutputPath>
@@ -84,4 +87,4 @@
8487
</ProjectReference>
8588
</ItemGroup>
8689
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
87-
</Project>
90+
</Project>

test/EntityFramework6.Npgsql.Tests/project.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
"keyFile": "../../Npgsql.snk",
55
"emitEntryPoint": true
66
},
7-
"runtimes": {
8-
"win": {}
9-
},
107
"dependencies": {
118
"NUnit": "3.2.1",
129
"NUnitLite": "3.2.1",

test/Npgsql.Tests/Npgsql.Tests.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
<RestorePackages>true</RestorePackages>
1414
<TargetFrameworkProfile />
1515
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
16+
<!-- The following stops VS from complaining about runtimes in project.json, see
17+
https://github.com/Microsoft/msbuild/issues/394 -->
18+
<CopyNuGetImplementations>false</CopyNuGetImplementations>
1619
</PropertyGroup>
1720
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1821
<OutputPath>bin\Debug\</OutputPath>
@@ -98,4 +101,4 @@
98101
</ProjectReference>
99102
</ItemGroup>
100103
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
101-
</Project>
104+
</Project>

0 commit comments

Comments
 (0)
X Tutup