diff options
| author | Nate McMaster <natemcmaster@users.noreply.github.com> | 2019-06-08 03:19:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-08 03:19:41 +0300 |
| commit | 41ce223c1cf4ffd482c4ea36e88ed44a94db37b3 (patch) | |
| tree | 5f0c7df8ad54beff195e588cf6410ab6eb60696e /activate.ps1 | |
| parent | b5adc6b156ba8e08d95e0dc5585973deb09f0993 (diff) | |
Replace Internal.AspNetCore.Sdk with Microsoft.DotNet.Arcade.Sdk (#10674)
* Update build.cmd to install .NET Core into $repoRoot/.dotnet instead of $repoRoot/.dotnet/x64
* Move restore sources from build/sources.props into eng/Versions.props (following arcade conventions)
* Remove usages of RuntimeFrameworkVersion in tests and build
* Update Blazor VSIX to use Arcade VSIX tools
* Rename Common.Tests to IIS.Common.TestLib and make it a test asset
* Remove custom versions props for ANCM installer code
* Remove duplicate references to xunit and remove usages of IsTestProject
* Remove duplicate references to Internal.AspNetCore.Analyzers
* Import Arcade.Sdk props and targets and remove custom versioning props
* Remove references to Internal.AspNetCore.Sdk
* Rename PackageLicenseType => PackageLicenseExpression
* Remove dependency on tasks in Internal.AspNetCore.Sdk, add ref to Internal.AspNetCore.BuildTasks as a temporary workaround
* Use Arcade's nuspec support
* Rename SignalR.Client.FunctionalTests to SignalR.Client.FunctionalTestApp
* Fixes for changes to property evaluation order
* Update BaseLineGenerator to netcoreapp3.0
* React to changes in evaluation order in RPM files and quirks in using <Exec> instead of <Run>
* Update Microsoft.Extensions.ApiDescription.Server to react to changes in Arcade packaging
* Workaround aspnet/AspNetCore#11009
Diffstat (limited to 'activate.ps1')
| -rw-r--r-- | activate.ps1 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activate.ps1 b/activate.ps1 index 194ac8d349..bc6f326e8b 100644 --- a/activate.ps1 +++ b/activate.ps1 @@ -37,7 +37,8 @@ deactivate -init $_OLD_PATH = $env:PATH # Tell dotnet where to find itself -$env:DOTNET_ROOT = "$PSScriptRoot\.dotnet\x64" +$env:DOTNET_ROOT = "$PSScriptRoot\.dotnet" +${env:DOTNET_ROOT(x86)} = "$PSScriptRoot\.dotnet\x86" # Tell dotnet not to look beyond the DOTNET_ROOT folder for more dotnet things $env:DOTNET_MULTILEVEL_LOOKUP = 0 # Put dotnet first on PATH |