Skip to content

Commit cfd963c

Browse files
shirhattishirhatti
committed
Merge branch 'shirhatti/nuget' into dev
2 parents 191e14b + d245ded commit cfd963c

File tree

5 files changed

+67
-1
lines changed

5 files changed

+67
-1
lines changed

‎AspNetCoreModule.sln

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25123.0
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AspNetCore", "src\AspNetCore\AspNetCore.vcxproj", "{439824F9-1455-4CC4-BD79-B44FA0A16552}"
77
ProjectSection(ProjectDependencies) = postProject
@@ -10,26 +10,41 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AspNetCore", "src\AspNetCor
1010
EndProject
1111
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "src\IISLib\IISLib.vcxproj", "{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}"
1212
EndProject
13+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{02F461DC-5166-4E88-AAD5-CF110016A647}"
14+
EndProject
15+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2097C03C-E2F7-4396-B3BC-4335F1B87B5E}"
16+
ProjectSection(SolutionItems) = preProject
17+
global.json = global.json
18+
EndProjectSection
19+
EndProject
20+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FDD2EDF8-1B62-4978-9815-9D95260B8B91}"
21+
EndProject
1322
Global
1423
GlobalSection(SolutionConfigurationPlatforms) = preSolution
24+
Debug|Any CPU = Debug|Any CPU
1525
Debug|Win32 = Debug|Win32
1626
Debug|x64 = Debug|x64
27+
Release|Any CPU = Release|Any CPU
1728
Release|Win32 = Release|Win32
1829
Release|x64 = Release|x64
1930
EndGlobalSection
2031
GlobalSection(ProjectConfigurationPlatforms) = postSolution
32+
{439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|Any CPU.ActiveCfg = Debug|Win32
2133
{439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|Win32.ActiveCfg = Release|x64
2234
{439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|Win32.Build.0 = Release|x64
2335
{439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x64.ActiveCfg = Release|x64
2436
{439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x64.Build.0 = Release|x64
37+
{439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|Any CPU.ActiveCfg = Release|Win32
2538
{439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|Win32.ActiveCfg = Release|Win32
2639
{439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|Win32.Build.0 = Release|Win32
2740
{439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|x64.ActiveCfg = Release|Win32
2841
{439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|x64.Build.0 = Release|Win32
42+
{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|Any CPU.ActiveCfg = Debug|Win32
2943
{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|Win32.ActiveCfg = Release|x64
3044
{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|Win32.Build.0 = Release|x64
3145
{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.ActiveCfg = Release|x64
3246
{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.Build.0 = Release|x64
47+
{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|Any CPU.ActiveCfg = Release|Win32
3348
{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|Win32.ActiveCfg = Release|Win32
3449
{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|Win32.Build.0 = Release|Win32
3550
{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x64.ActiveCfg = Release|Win32
@@ -38,4 +53,8 @@ Global
3853
GlobalSection(SolutionProperties) = preSolution
3954
HideSolutionNode = FALSE
4055
EndGlobalSection
56+
GlobalSection(NestedProjects) = preSolution
57+
{439824F9-1455-4CC4-BD79-B44FA0A16552} = {FDD2EDF8-1B62-4978-9815-9D95260B8B91}
58+
{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE} = {FDD2EDF8-1B62-4978-9815-9D95260B8B91}
59+
EndGlobalSection
4160
EndGlobal

‎global.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"projects": [ "test" ]
3+
}

‎makefile.shade

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
default BASE_DIR_LOCAL='${Directory.GetCurrentDirectory()}'
2+
default BUILD_DIR_LOCAL='${Path.Combine(BASE_DIR_LOCAL, "artifacts", "build")}'
3+
var VERSION='0.1'
4+
var FULL_VERSION='0.1'
5+
6+
use-standard-lifecycle
7+
k-standard-goals
8+
9+
#make-nupkg target='package'
10+
log info='Make nuget package containing ASP.NET Core Module'
11+
@{
12+
var nugetExePath = Environment.GetEnvironmentVariable("KOREBUILD_NUGET_EXE");
13+
if (string.IsNullOrEmpty(nugetExePath))
14+
{
15+
nugetExePath = Path.Combine(BASE_DIR_LOCAL, ".build", "nuget.exe");
16+
}
17+
18+
var nuspecPath = Path.Combine(BASE_DIR_LOCAL, "nuget", "AspNetCore.nuspec");
19+
ExecClr(nugetExePath, "pack " + nuspecPath + " -OutputDirectory " + BUILD_DIR_LOCAL + " -prop VERSION=1.0.0-" + BuildNumber);
20+
}

‎nuget/AspNetCore.nuspec

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0"?>
2+
<package>
3+
<metadata>
4+
<id>Microsoft.AspNetCore.AspNetCoreModule</id>
5+
<title>Microsoft ASP.NET Core Module</title>
6+
<version>$VERSION$</version>
7+
<authors>Microsoft</authors>
8+
<owners>Microsoft</owners>
9+
<licenseUrl>http://www.microsoft.com/web/webpi/eula/net_library_eula_ENU.htm</licenseUrl>
10+
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
11+
<projectUrl>http://www.asp.net/</projectUrl>
12+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
13+
<description>ASP.NET Core Module</description>
14+
<language>en-US</language>
15+
</metadata>
16+
<files>
17+
<file src="..\artifacts\build\AspNetCore\bin\**" target="ancm\" />
18+
</files>
19+
</package>

‎src/AspNetCore/AspNetCore.vcxproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,11 @@
231231
<ItemGroup>
232232
<None Include="Source.def" />
233233
</ItemGroup>
234+
<ItemGroup>
235+
<Content Include="aspnetcore_schema.xml">
236+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
237+
</Content>
238+
</ItemGroup>
234239
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
235240
<ImportGroup Label="ExtensionTargets">
236241
</ImportGroup>

0 commit comments

Comments
 (0)