Skip to content
This repository has been archived by the owner on May 21, 2019. It is now read-only.

Cleanup workarounds #233

Merged
merged 3 commits into from
May 1, 2017
Merged

Cleanup workarounds #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ddcd05
Cleanup workarounds
Apr 27, 2017
05ee8a8
Re-add RepositoryRoot to preflight restore in case something has star…
Apr 27, 2017
6b06755
Revert color changes
May 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ PublishProfiles/
*.cache
*.docstates
_ReSharper.*
nuget.exe
*.exe
*.dll
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What DLLs and EXEs now need to be ignored?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ping @natemcmaster

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nothing new. Just general cleanup.

*net45.csproj
*net451.csproj
*k10.csproj
Expand Down
13 changes: 0 additions & 13 deletions build/KoreBuild.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,17 +98,6 @@ if (!($env:Path.Split(';') -icontains $dotnetLocalInstallFolder))
$env:Path = "$newPath"
}

# wokaround for CLI issue: https://github.com/dotnet/cli/issues/2143
$sharedPath = (Join-Path (Split-Path ((get-command dotnet.exe).Path) -Parent) "shared");
(Get-ChildItem $sharedPath -Recurse *dotnet.exe) | %{ $_.FullName } | Remove-Item;

# We still nuget because dotnet doesn't have support for pushing packages
$nugetExePath = Join-Path $PSScriptRoot 'nuget.exe'
if (!(Test-Path $nugetExePath))
{
Invoke-WebRequest "https://dist.nuget.org/win-x86-commandline/v4.0.0-rc4/NuGet.exe" -OutFile "$PSScriptRoot/nuget.exe"
}

$makeFileProj = "$PSScriptRoot/KoreBuild.proj"
$msbuildArtifactsDir = "$repoFolder/artifacts/msbuild"
$msbuildLogFilePath = "$msbuildArtifactsDir/msbuild.log"
Expand Down Expand Up @@ -142,7 +131,5 @@ if (!(Test-Path $msbuildArtifactsDir))

$msBuildArguments | Out-File -Encoding ASCII -FilePath $msBuildResponseFile

# workaround https://github.com/dotnet/core-setup/issues/1664
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did this get fixed? The work item this pointed to isn't closed as yet?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested. Its been fixed. dotnet/core-setup#2055 It just looks like the bug hasn't been closed.

"{ `"sdk`": { `"version`": `"$dotnetVersion`" } }" | Out-File "$repoFolder/global.json" -Encoding ascii
exec dotnet msbuild /nologo $preflightClpOption /t:Restore /p:PreflightRestore=true "$makeFileProj"
exec dotnet msbuild `@"$msBuildResponseFile"
17 changes: 0 additions & 17 deletions build/KoreBuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,26 +133,12 @@ else
fi
fi

# workaround for CLI issue: https://github.com/dotnet/cli/issues/2143
DOTNET_PATH=`which dotnet | head -n 1`
ROOT_PATH=`dirname $DOTNET_PATH`
FOUND=`find $ROOT_PATH/shared -name dotnet`
if [ ! -z "$FOUND" ]; then
echo $FOUND | xargs rm
fi

netfxversion='4.6.1'
if [ "$NUGET_PACKAGES" == "" ]; then
NUGET_PACKAGES="$HOME/.nuget/packages"
fi
export ReferenceAssemblyRoot=$NUGET_PACKAGES/netframeworkreferenceassemblies/$netfxversion/content

nugetPath="$scriptRoot/nuget.exe"
if [ ! -f $nugetPath ]; then
nugetUrl="https://dist.nuget.org/win-x86-commandline/v4.0.0-rc4/NuGet.exe"
wget -O $nugetPath $nugetUrl 2>/dev/null || curl -o $nugetPath --location $nugetUrl 2>/dev/null
fi

makeFileProj="$scriptRoot/KoreBuild.proj"
msbuildArtifactsDir="$repoFolder/artifacts/msbuild"
msbuildPreflightResponseFile="$msbuildArtifactsDir/msbuild.preflight.rsp"
Expand Down Expand Up @@ -181,9 +167,6 @@ $preflightClpOption
"$makeFileProj"
ENDMSBUILDPREFLIGHT

# workaround https://github.com/dotnet/core-setup/issues/1664
echo "{\"sdk\":{\"version\":\"$KOREBUILD_DOTNET_VERSION\"}}" > "$repoFolder/global.json"

__exec dotnet msbuild @"$msbuildPreflightResponseFile"

cat > $msbuildResponseFile <<ENDMSBUILDARGS
Expand Down
1 change: 1 addition & 0 deletions template/version.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<!-- This file may be overwritten by automation. Only values allowed here are VersionPrefix and VersionSuffix. -->
<Project>
<PropertyGroup>
<!-- These values are just an example and not used in build. -->
<VersionPrefix>1.2.0</VersionPrefix>
<VersionSuffix>preview1</VersionSuffix>
</PropertyGroup>
Expand Down