latest dotnet cli sdk. fix local test run scripts
This commit is contained in:
Родитель
9ebb0fab9f
Коммит
c77171af17
|
@ -35,14 +35,15 @@ Developing
|
|||
To successfully build the sources on your machine, make sure you've installed the following prerequisites:
|
||||
* Visual Studio 2017 Community or Enterprise. Please make sure to install all the latest updates to Visual Studio
|
||||
* .NET 4.6
|
||||
* .NET Core 2.0
|
||||
* .NET Core SDK 1.1.7
|
||||
* .NET Core SDK 2.0 or above.(https://www.microsoft.com/net/download/windows)
|
||||
|
||||
## Building
|
||||
Once you've installed the prerequisites execute ```buildDebug.cmd``` or ```buildRelease.cmd``` script in the repository root to build the project locally.
|
||||
You can also open the solution in Visual Studio and build the ApplicationInsights.AspNetCore.sln solution directly.
|
||||
|
||||
## Testing/Debugging
|
||||
Execute the ```runAllTests.cmd``` script in the repository root.
|
||||
Execute the ```RunTests.cmd``` script in the repository root.
|
||||
|
||||
You can also open the solution in Visual Studio and run tests directly from Visual Studio Test Explorer. However, as the tests has multiple targets, Test Explorer only shows the first target
|
||||
from <TargetFrameworks> in .csproj. To debug/run tests from a particular TargetFramework with Visual Studio, only option is to re-arrange the <TargetFrameworks>
|
||||
|
|
12
dirs.proj
12
dirs.proj
|
@ -3,8 +3,8 @@
|
|||
<Import Project="Signing.props"/>
|
||||
|
||||
<PropertyGroup>
|
||||
<CliZipFile>$(BUILD_ARTIFACTSTAGINGDIRECTORY)\dotnet-sdk-2.0.0-win-x64.zip</CliZipFile>
|
||||
<CliToolsPath>$(BUILD_ARTIFACTSTAGINGDIRECTORY)\dotnet-sdk-2.0.0-win-x64.latest</CliToolsPath>
|
||||
<CliZipFile>$(BUILD_ARTIFACTSTAGINGDIRECTORY)\dotnet-sdk-2.1.4-win-x64.zip</CliZipFile>
|
||||
<CliToolsPath>$(BUILD_ARTIFACTSTAGINGDIRECTORY)\dotnet-sdk-2.1.4-win-x64.latest</CliToolsPath>
|
||||
<!-- Library -->
|
||||
<ProjectToBuild>.\src\Microsoft.ApplicationInsights.AspNetCore\Microsoft.ApplicationInsights.AspNetCore.csproj</ProjectToBuild>
|
||||
</PropertyGroup>
|
||||
|
@ -163,8 +163,8 @@
|
|||
</Target>
|
||||
|
||||
<Target Name="DownloadCLI">
|
||||
<!--<DownloadFile Address="https://download.microsoft.com/download/E/7/8/E782433E-7737-4E6C-BFBF-290A0A81C3D7/dotnet-sdk-2.0.0-win-x64.zip" FileName="$(CliZipFile)" />-->
|
||||
<DownloadFile Address="https://download.microsoft.com/download/1/B/4/1B4DE605-8378-47A5-B01B-2C79D6C55519/dotnet-sdk-2.0.0-win-x64.zip" FileName="$(CliZipFile)" />
|
||||
<!--<DownloadFile Address="https://download.microsoft.com/download/E/7/8/E782433E-7737-4E6C-BFBF-290A0A81C3D7/dotnet-sdk-2.1.4-win-x64.zip" FileName="$(CliZipFile)" />-->
|
||||
<DownloadFile Address="https://download.microsoft.com/download/1/1/5/115B762D-2B41-4AF3-9A63-92D9680B9409/dotnet-sdk-2.1.4-win-x64.zip" FileName="$(CliZipFile)" />
|
||||
<ExtractZipArchive InputFiles="$(CliZipFile)" OutputPath="$(CliToolsPath)" ArchiveFileNameAsRootFolder="false" Overwrite="true" />
|
||||
</Target>
|
||||
|
||||
|
@ -187,8 +187,8 @@
|
|||
<Target Name="Clean">
|
||||
<RemoveDir Directories="$(BinRoot)\$(Configuration)" />
|
||||
<RemoveDir Directories="$(BaseIntermediateOutputPath)" />
|
||||
<RemoveDir Directories="$(BUILD_ARTIFACTSTAGINGDIRECTORY)\dotnet-sdk-2.0.0-win-x64.latest" />
|
||||
<Delete Files="$(BUILD_ARTIFACTSTAGINGDIRECTORY)\dotnet-sdk-2.0.0-win-x64.zip" />
|
||||
<RemoveDir Directories="$(BUILD_ARTIFACTSTAGINGDIRECTORY)\dotnet-sdk-2.1.4-win-x64.latest" />
|
||||
<Delete Files="$(BUILD_ARTIFACTSTAGINGDIRECTORY)\dotnet-sdk-2.1.4-win-x64.zip" />
|
||||
</Target>
|
||||
|
||||
<Target Name="AfterBuild" AfterTargets="Test" DependsOnTargets="Test">
|
||||
|
|
|
@ -7,7 +7,7 @@ IF DEFINED MSBUILD (
|
|||
)
|
||||
|
||||
SET VSWHERE=..\packages\vswhere\tools\vswhere.exe
|
||||
IF NOT EXIST "%VSWHERE%" nuget.exe install vswhere -NonInteractive -ExcludeVersion -Source https://www.nuget.org/api/v2 > nul
|
||||
IF NOT EXIST "%VSWHERE%" nuget.exe install vswhere -NonInteractive -ExcludeVersion -Source https://www.nuget.org/api/v2 -OutputDirectory ..\packages> nul
|
||||
|
||||
FOR /f "usebackq tokens=*" %%i in (`"%VSWHERE%" -version %VSVERSION% -products * -requires Microsoft.Component.MSBuild -property installationPath`) DO (
|
||||
SET MSBUILD=%%i\MSBuild\%VSVERSION%\Bin\MSBuild.exe
|
||||
|
|
Загрузка…
Ссылка в новой задаче