Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Merge rel/1.1.0 to release/2.0.0 #7059

Merged
livarcocc merged 12 commits into from
Jul 3, 2017
Merged

Merge rel/1.1.0 to release/2.0.0 #7059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
db7ebc9
Add F# to dotnet cli 1..1.0
KevinRansom Jun 29, 2017
2746e5c
MSBuild 15.3.402
rainersigwald Jun 29, 2017
508ad89
Enable VB for dotnet cli 1.1
KevinRansom Jun 29, 2017
7af5450
feedback
KevinRansom Jun 29, 2017
5b6ab87
Merge pull request #7028 from rainersigwald/msbuild-402-for-1.1
Jun 29, 2017
7d25028
Merge pull request #7032 from KevinRansom/vb
Jun 30, 2017
13e84f7
Merge pull request #7033 from KevinRansom/rel/1.1.0
Jun 30, 2017
dd137f6
Revert "Pinning the SDK version to: "2.0.0-preview3-006628""
Jul 1, 2017
557dd8d
Update to SetupCrossgen 229 - Coherence 26027
mlorbetske Jul 1, 2017
7411667
Merge pull request #7055 from wli3/unpinning-SDK-version
Jul 3, 2017
0578b62
Merge pull request #7057 from mlorbetske/dev/mlorbe/UpdateToSetupCros…
Jul 3, 2017
2b148ae
Merge remote-tracking branch 'dotnet/rel/1.1.0' into merges/rel/1.1.0…
livarcocc Jul 3, 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
2 changes: 2 additions & 0 deletions Microsoft.DotNet.Cli.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-remove-package.Tests
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-add-package.Tests", "test\dotnet-add-package.Tests\dotnet-add-package.Tests.csproj", "{08A40B6A-F695-4EA9-AC8D-CF88FADEA796}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_fsc", "src\tool_fsharp\tool_fsc.csproj", "{602976C5-2477-4B4C-AD9A-1EAFB250529A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down
8 changes: 4 additions & 4 deletions build/DependencyVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
<HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
<TemplateEngineVersion>1.0.0-beta2-20170629-268</TemplateEngineVersion>
<TemplateEngineTemplateVersion>1.0.0-beta2-20170629-268</TemplateEngineTemplateVersion>
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170629-268</TemplateEngineTemplate2_0Version>
<TemplateEngineTemplateVersion>1.0.0-beta2-20170630-271</TemplateEngineTemplateVersion>
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170630-271</TemplateEngineTemplate2_0Version>
<PlatformAbstractionsVersion>2.0.0-preview3-25428-01</PlatformAbstractionsVersion>
<DependencyModelVersion>2.0.0-preview3-25428-01</DependencyModelVersion>
<CliCommandLineParserVersion>0.1.1-alpha-167</CliCommandLineParserVersion>
Expand All @@ -35,9 +35,9 @@

<!-- This should either be timestamped or notimestamp as appropriate -->
<AspNetCoreRuntimePackageFlavor>timestamped</AspNetCoreRuntimePackageFlavor>
<AspNetCoreRuntimeVersion>dev-224</AspNetCoreRuntimeVersion>
<AspNetCoreRuntimeVersion>dev-229</AspNetCoreRuntimeVersion>
<AspNetCoherenceLabel>preview3</AspNetCoherenceLabel>
<AspNetCoreCoherenceTimestamp>25975</AspNetCoreCoherenceTimestamp>
<AspNetCoreCoherenceTimestamp>26027</AspNetCoreCoherenceTimestamp>

</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions run-build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ $env:VSTEST_TRACE_BUILD=1
# install a stage0
$dotnetInstallPath = Join-Path $RepoRoot "scripts\obtain\dotnet-install.ps1"

Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"" -Version 2.0.0-preview3-006628"
Invoke-Expression "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"" -Version 2.0.0-preview3-006628"
Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
Invoke-Expression "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
if ($LastExitCode -ne 0)
{
Write-Output "The .NET CLI installation failed with exit code $LastExitCode"
Expand Down
2 changes: 1 addition & 1 deletion run-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ export VSTEST_TRACE_BUILD=1
export DOTNET_MULTILEVEL_LOOKUP=0

# Install a stage 0
(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "release/2.0.0" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" --version "2.0.0-preview3-006628" $LINUX_PORTABLE_INSTALL_ARGS)
(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "release/2.0.0" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS)

EXIT_CODE=$?
if [ $EXIT_CODE != 0 ]; then
Expand Down