diff --git a/build.ps1 b/build.ps1 index 873aa61..af2eccf 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 @@ -44,18 +44,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 @@ -65,4 +65,4 @@ if (!(Test-Path $buildFolder)) { } } -&"$buildFile" $args \ No newline at end of file +&"$buildFile" @args diff --git a/build/repo.props b/build/repo.props index 66fa8a5..85b5eb9 100644 --- a/build/repo.props +++ b/build/repo.props @@ -1,8 +1,5 @@ - - 1.0.2-rc2-15276 - - + - \ No newline at end of file + diff --git a/build/repo.targets b/build/repo.targets index ac1fd34..ebcb8c2 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -4,17 +4,17 @@ $(NuGetPublishFeed)/npm/ $(BuildDependsOn);RunVerifier;RunSplitPackages;PublishNpmModules - + - + dev Latest Latest false - + - + @@ -31,7 +31,7 @@ - + $(RepositoryRoot)tools\CoherenceBuild\ @(VerifierArgsList, ' ') @@ -41,17 +41,13 @@ - - $([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))splitpackages\$(SplitPackagesVersion) - $(ArtifactsDir)product-packages $(RepositoryRoot)packages\packages.csv - $(SplitPackagePath)\SplitPackages.dll --source $(ProductPackagesSource) --csv $(SplitPackagesCsv) --destination $(ArtifactsDir) - + @@ -60,11 +56,11 @@ $(NpmRegistry.Replace("https:", "")):_authToken - + - + @@ -78,4 +74,4 @@ - \ No newline at end of file + diff --git a/project.json b/project.json deleted file mode 100644 index cfda186..0000000 --- a/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "SplitPackages": "1.0.1-*", - "DependenciesPackager": "1.0.1-*" - }, - "frameworks": { - "net451": { } - } -} \ No newline at end of file