File tree Expand file tree Collapse file tree 5 files changed +21
-24
lines changed Expand file tree Collapse file tree 5 files changed +21
-24
lines changed Original file line number Diff line number Diff line change @@ -276,7 +276,6 @@ functions @{
276276
277277 private static string GetProjectDirectoryName(string resourceDirPath)
278278 {
279- const string projectFileName = "project.json";
280279 string rootPath = RemoveLastSlash(Path.GetPathRoot(resourceDirPath));
281280 string projectDirPath = RemoveLastSlash(resourceDirPath);
282281
@@ -287,9 +286,7 @@ functions @{
287286 throw new FileNotFoundException("Project file not exist.");
288287 }
289288
290- string projectFilePath = Path.Combine(projectDirPath, projectFileName);
291- if (File.Exists(projectFilePath)
292- || Directory.EnumerateFiles(projectDirPath, "*.csproj", SearchOption.TopDirectoryOnly).Any())
289+ if (Directory.EnumerateFiles(projectDirPath, "*.csproj", SearchOption.TopDirectoryOnly).Any())
293290 {
294291 break;
295292 }
Original file line number Diff line number Diff line change 22
33setlocal
44set ORIGINAL_CURRENT_DIR = %cd%
5- set KOREBUILD_DOTNET_CHANNEL = preview
6- set KOREBUILD_DOTNET_VERSION = 1.0.0-preview2-003156
5+ set KOREBUILD_DOTNET_CHANNEL = rel-1.0.0
6+ set KOREBUILD_DOTNET_VERSION = 1.0.1
77
88cd %~dp0
99
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ cd $PSScriptRoot
3333$repoFolder = $PSScriptRoot
3434$env: REPO_FOLDER = $repoFolder
3535
36- $koreBuildZip = " https://github.com/aspnet/KoreBuild/archive/1.0.0 .zip"
36+ $koreBuildZip = " https://github.com/aspnet/KoreBuild/archive/02bd945d32558d24c1e5c6b74e37d44585ad9691 .zip"
3737if ($env: KOREBUILD_ZIP )
3838{
3939 $koreBuildZip = $env: KOREBUILD_ZIP
Original file line number Diff line number Diff line change 11#! /usr/bin/env bash
22ORIGINAL_CURRENT_DIR=%cd%
3- KOREBUILD_DOTNET_CHANNEL=preview
4- KOREBUILD_DOTNET_VERSION=1.0.0-preview2-003156
3+ KOREBUILD_DOTNET_CHANNEL=rel-1.0.0
4+ KOREBUILD_DOTNET_VERSION=1.0.1
55
66repoFolder=" $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && pwd ) "
77cd $repoFolder
88
9- koreBuildZip=" https://github.com/aspnet/KoreBuild/archive/1.0.0 .zip"
9+ koreBuildZip=" https://github.com/aspnet/KoreBuild/archive/02bd945d32558d24c1e5c6b74e37d44585ad9691 .zip"
1010if [ ! -z $KOREBUILD_ZIP ]; then
1111 koreBuildZip=$KOREBUILD_ZIP
1212fi
@@ -16,12 +16,12 @@ buildFile="$buildFolder/KoreBuild.sh"
1616
1717if test ! -d $buildFolder ; then
1818 echo " Downloading KoreBuild from $koreBuildZip "
19-
20- tempFolder=" /tmp/KoreBuild-$( uuidgen) "
19+
20+ tempFolder=" /tmp/KoreBuild-$( uuidgen) "
2121 mkdir $tempFolder
22-
22+
2323 localZipFile=" $tempFolder /korebuild.zip"
24-
24+
2525 retries=6
2626 until (wget -O $localZipFile $koreBuildZip 2> /dev/null || curl -o $localZipFile --location $koreBuildZip 2> /dev/null)
2727 do
@@ -33,17 +33,17 @@ if test ! -d $buildFolder; then
3333 echo " Waiting 10 seconds before retrying. Retries left: $retries "
3434 sleep 10s
3535 done
36-
36+
3737 unzip -q -d $tempFolder $localZipFile
38-
38+
3939 mkdir $buildFolder
4040 cp -r $tempFolder /** /build/** $buildFolder
41-
41+
4242 chmod +x $buildFile
43-
43+
4444 # Cleanup
4545 if test ! -d $tempFolder ; then
46- rm -rf $tempFolder
46+ rm -rf $tempFolder
4747 fi
4848fi
4949
Original file line number Diff line number Diff line change @@ -6,13 +6,13 @@ use import="Files"
66use import="BuildEnv"
77use import="Environment"
88
9- default BASE_DIR=' ${Directory.GetCurrentDirectory()}'
9+ default BASE_DIR=" ${Directory.GetCurrentDirectory()}"
1010
11- var AUTHORS=' Andrey Taritsyn'
11+ var AUTHORS=" Andrey Taritsyn"
1212
1313use-standard-lifecycle
1414
15- #resx description=' Converts .resx files to .Designer.cs' target=' initialize'
15+ #resx description=" Converts .resx files to .Designer.cs" target=" initialize"
1616 @{
1717 string currentDirPath;
1818 string originalCurrentDirPath = Environment.GetEnvironmentVariable("ORIGINAL_CURRENT_DIR");
@@ -41,8 +41,8 @@ use-standard-lifecycle
4141 Log.Info(string.Format(' * "{0}" is processed', relativeFilePath));
4242 }
4343
44- Log.Info('' );
44+ Log.Info("" );
4545 }
4646
47- macro name="GenerateResx" resxFile=' string'
47+ macro name="GenerateResx" resxFile=" string"
4848 generate-resx
You can’t perform that action at this time.
0 commit comments