diff --git a/.gitignore b/.gitignore
index 9d24973eeb..03944b51ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,4 +48,5 @@ src/AspNetCore/aspnetcore_msg.rc
src/AspNetCore/version.h
.build
-*.VC.*db
\ No newline at end of file
+*.VC.*db
+global.json
\ No newline at end of file
diff --git a/Build/Key.snk b/Build/Key.snk
new file mode 100644
index 0000000000..e10e4889c1
Binary files /dev/null and b/Build/Key.snk differ
diff --git a/Build/common.props b/Build/common.props
new file mode 100644
index 0000000000..c87cc995fa
--- /dev/null
+++ b/Build/common.props
@@ -0,0 +1,23 @@
+
+
+
+
+
+ Microsoft ASP.NET Core
+ https://github.com/aspnet/AspNetCoreModule
+ git
+ $(MSBuildThisFileDirectory)Key.snk
+ true
+ true
+ $(VersionSuffix)-$(BuildNumber)
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Build/dependencies.props b/Build/dependencies.props
new file mode 100644
index 0000000000..8c81df7f34
--- /dev/null
+++ b/Build/dependencies.props
@@ -0,0 +1,11 @@
+
+
+ 1.2.0-*
+ 4.3.0
+ 2.0.0-*
+ 1.6.1
+ 2.0.0-*
+ 15.0.0
+ 2.2.0
+
+
\ No newline at end of file
diff --git a/NuGet.config b/NuGet.config
index 4e531e985d..6f9f028ca1 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -2,7 +2,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/build.ps1 b/build.ps1
index 0605b59c01..dc220d733f 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,6 +1,6 @@
$ErrorActionPreference = "Stop"
-function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries)
+function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries)
{
while($true)
{
@@ -19,7 +19,7 @@ function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $ret
Start-Sleep -Seconds 10
}
- else
+ else
{
$exception = $_.Exception
throw $exception
@@ -33,7 +33,7 @@ cd $PSScriptRoot
$repoFolder = $PSScriptRoot
$env:REPO_FOLDER = $repoFolder
-$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip"
+$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
if ($env:KOREBUILD_ZIP)
{
$koreBuildZip=$env:KOREBUILD_ZIP
@@ -43,18 +43,18 @@ $buildFolder = ".build"
$buildFile="$buildFolder\KoreBuild.ps1"
if (!(Test-Path $buildFolder)) {
- Write-Host "Downloading KoreBuild from $koreBuildZip"
-
+ Write-Host "Downloading KoreBuild from $koreBuildZip"
+
$tempFolder=$env:TEMP + "\KoreBuild-" + [guid]::NewGuid()
New-Item -Path "$tempFolder" -Type directory | Out-Null
$localZipFile="$tempFolder\korebuild.zip"
-
+
DownloadWithRetry -url $koreBuildZip -downloadLocation $localZipFile -retries 6
Add-Type -AssemblyName System.IO.Compression.FileSystem
[System.IO.Compression.ZipFile]::ExtractToDirectory($localZipFile, $tempFolder)
-
+
New-Item -Path "$buildFolder" -Type directory | Out-Null
copy-item "$tempFolder\**\build\*" $buildFolder -Recurse
@@ -64,4 +64,4 @@ if (!(Test-Path $buildFolder)) {
}
}
-&"$buildFile" $args
\ No newline at end of file
+&"$buildFile" @args
\ No newline at end of file
diff --git a/test/AspNetCoreModule.Test/aspnetcoremodule.test.csproj b/test/AspNetCoreModule.Test/aspnetcoremodule.test.csproj
index 58bcdc9a21..9da583a52b 100644
--- a/test/AspNetCoreModule.Test/aspnetcoremodule.test.csproj
+++ b/test/AspNetCoreModule.Test/aspnetcoremodule.test.csproj
@@ -1,7 +1,8 @@
+
- net452
+ net46
true
true
@@ -14,22 +15,17 @@
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/version.props b/version.props
new file mode 100644
index 0000000000..38c93687ab
--- /dev/null
+++ b/version.props
@@ -0,0 +1,7 @@
+
+
+
+ 1.2.0
+ preview1
+
+
\ No newline at end of file