Skip to content

Commit fc1cf70

Browse files
authored
Use latest 2.1.x .NET SDK (#381)
- noticed CI builds were using old 2.1.500 - `UseDotNet@2` seems to ignore `rollForward` when using global.json :frown: - nits: - quiet `dotnet` in CI (where `dotnet` is always new) - complain about all potentially missing components when VS isn't found - add a missing blank line
1 parent 8515e0b commit fc1cf70

File tree

4 files changed

+8
-1
lines changed

4 files changed

+8
-1
lines changed

azure-pipelines.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ parameters:
1414
variables:
1515
- name: DOTNET_CLI_TELEMETRY_OPTOUT
1616
value: 1
17+
- name: DOTNET_NOLOGO
18+
value: 1
1719
# Run CodeQL3000 tasks in a separate internal pipeline; not needed here.
1820
- name: Codeql.SkipTaskAutoInjection
1921
value: true

build.cmd

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ for /f "usebackq tokens=*" %%i in (`%vswhere% -version 16 -latest -prerelease -p
3535
set InstallDir="%%i"
3636
)
3737

38+
if not DEFINED InstallDir (
39+
echo "Could not find a VS2019 installation with the necessary components (MSBuild, .NET Core 2.1 Runtime, .NET SDK). Please install VS2019 or the missing components."
40+
)
41+
3842
if exist %InstallDir%\MSBuild\Current\Bin\MSBuild.exe (
3943
set MSBuild=%InstallDir%\MSBuild\Current\Bin\MSBuild.exe
4044
) else (

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "2.1.500",
3+
"version": "2.1.818",
44
"rollForward": "major"
55
}
66
}

src/System.Net.Http.Formatting/Handlers/ProgressStream.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public override async Task<int> ReadAsync(byte[] buffer, int offset, int count,
6767
ReportBytesReceived(readCount, userState: null);
6868
return readCount;
6969
}
70+
7071
#if !NETFX_CORE // BeginX and EndX are not supported on streams in portable libraries
7172
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
7273
{

0 commit comments

Comments
 (0)