Skip to content
This repository has been archived by the owner on Nov 28, 2020. It is now read-only.

Commit

Permalink
Merge branch 'release/0.35.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
devlead committed Oct 27, 2019
2 parents aba300b + 2b38013 commit fd2edd7
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Param(
[string[]]$ScriptArgs
)

$DotNetVersion = "2.1.500";
$DotNetVersion = "2.1.802";
$DotNetInstallerUri = "https://dot.net/v1/dotnet-install.ps1";
$NugetUrl = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"

Expand Down Expand Up @@ -82,7 +82,7 @@ if($FoundDotNetCliVersion -ne $DotNetVersion) {
###########################################################################

# Make sure nuget.exe exists.
$NugetPath = Join-Path $ToolPath "nuget.exe"
$NugetPath = Join-Path $ToolPath "nuget.exe"
if (!(Test-Path $NugetPath)) {
Write-Host "Downloading NuGet.exe..."
(New-Object System.Net.WebClient).DownloadFile($NugetUrl, $NugetPath);
Expand Down
2 changes: 1 addition & 1 deletion build/global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "2.1.4"
"version": "2.1.802"
}
}
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"projects": [ "src", "build" ],
"sdk": {
"version": "2.1.500"
"version": "2.1.802"
}
}
4 changes: 2 additions & 2 deletions src/Cake.Frosting/Cake.Frosting.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<DebugType>portable</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Cake.Core" Version="0.34.1" />
<PackageReference Include="Cake.Common" Version="0.34.1" />
<PackageReference Include="Cake.Core" Version="0.35.0" />
<PackageReference Include="Cake.Common" Version="0.35.0" />
<None Include="../../LICENSE" Pack="true" PackagePath="$(PackageLicenseFile)"/>
</ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
Expand Down
2 changes: 1 addition & 1 deletion template/Build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Frosting" Version="0.33.0" />
<PackageReference Include="Cake.Frosting" Version="0.35.0" />
</ItemGroup>

</Project>

0 comments on commit fd2edd7

Please sign in to comment.