Skip to content

Move to .NET Core 3.1 preview 1 #10798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adityapatwardhan merged 3 commits into from
Oct 18, 2019
Merged

Move to .NET Core 3.1 preview 1 #10798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9a8303
Move to .NET Core 3.1 preview 1
adityapatwardhan Oct 15, 2019
f069d5e
Change netcoreapp3.0 to netcoreapp3.1
adityapatwardhan Oct 18, 2019
d67c19b
Update WXS file
adityapatwardhan Oct 18, 2019
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: 1 addition & 1 deletion .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
#-------------------------------------------------------------------------------------------------------------

FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100
FROM mcr.microsoft.com/dotnet/core/sdk:3.1.100-preview1

# Avoid warnings by switching to noninteractive
ENV DEBIAN_FRONTEND=noninteractive
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// See https://aka.ms/vscode-remote/devcontainer.json for format details.
{
"name": ".NET Core 3.0, including pwsh (Debian 10)",
"name": ".NET Core 3.1, including pwsh (Debian 10)",
"dockerFile": "Dockerfile",

// Uncomment the next line to run commands after the container is created.
Expand Down
2 changes: 1 addition & 1 deletion PowerShell.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<Company>Microsoft Corporation</Company>
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>

<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<LangVersion>8.0</LangVersion>

<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
37 changes: 19 additions & 18 deletions assets/files.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1190,9 +1190,6 @@
<File Id="fil1c8a95614a8348f9ac6982b3340a303c" KeyPath="yes" Source="$(env.ProductSourcePath)\Microsoft.PowerShell.MarkdownRender.xml" />
</Component>
<Directory Id="dir23E9C47466D341314C603F5C7118348B" Name="ref">
<Component Id="cmpB099C5A4EB94441FB3C157D6404DA2E7" Guid="{7faa6210-548b-48cf-ae70-1d7f1923c7d9}">
<File Id="fil9632C22AC57E4377B9C3D6812F263E86" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Runtime.CompilerServices.Unsafe.dll" />
</Component>
<Component Id="cmp50D8B0DCCF114B58987590FF8212ACB9" Guid="{4becf3e6-7053-4492-936d-387c84720b19}">
<File Id="filAAF1E2DE95144FAD97B91D1E8EA8ADC6" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Data.DataSetExtensions.dll" />
</Component>
Expand Down Expand Up @@ -1271,9 +1268,6 @@
<Component Id="cmp233ECE5484784D0C833558389DA72398" Guid="{67806c3f-fc40-4e44-aede-176848cdd97f}">
<File Id="filDB7C91DF3CB74AD6B9E8417C6A468C35" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Web.dll" />
</Component>
<Component Id="cmp13F0A9B5C32849FA842B36577C88BFEF" Guid="{3216a244-2fe5-4b6d-9f80-41f74e367df4}">
<File Id="fil7989C1B840624B7FB4BCF16566729152" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Diagnostics.DiagnosticSource.dll" />
</Component>
<Component Id="cmp4891B5387F1A4769AD551054026FF74E" Guid="{a4062104-969d-4683-9c5f-36bb6cab5798}">
<File Id="filA20634489AB749EBA2D0BB9CBF9E5F64" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.IO.MemoryMappedFiles.dll" />
</Component>
Expand Down Expand Up @@ -1634,15 +1628,21 @@
<Component Id="cmp770700CA06564FB187D1CD2A79AA3DA8" Guid="{c244e7e1-3cb0-4880-aba5-e2be4fd78fbf}">
<File Id="fil88BCFE5237EE44A6AF259F91B9DF39C0" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.IO.FileSystem.Watcher.dll" />
</Component>
<Component Id="cmpDF06C5F29CD741FDBFDD3B3FF2134738" Guid="{ce9893cc-1824-4c95-b084-d25e3504e88b}">
<File Id="filC170825F0A4C46CFBE741925672B0541" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Text.Encodings.Web.dll" />
</Component>
<Component Id="cmp504FA9ED665C4D148AEE907B3380AFAA" Guid="{958b0471-6bc9-4bd4-8b57-36ff356ee399}">
<File Id="filDCCA3EFB76F64C599B47D289A0C6B23A" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Text.Encoding.CodePages.dll" />
</Component>
<Component Id="cmpEA40E9164309426C88C4388FDCA9559D" Guid="{2c84f9de-c203-4551-bde8-71e9e7e21f45}">
<File Id="fil205C9BE7027A408B985D96F5EEF11594" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Threading.Channels.dll" />
</Component>
<Component Id="cmp34649490F5B04041A08E73D7A86D5A5A" Guid="{d8f897d8-16cd-41a0-b5d7-863f379b30a2}">
<File Id="fil2DDAEABD470A475E950B94AC186DAB2E" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Text.Encodings.Web.dll" />
</Component>
<Component Id="cmpB3116053008E492C9B36C89BF682B8F7" Guid="{6572fcd7-3c98-4180-b3da-bdaeb21294cd}">
<File Id="fil0D09CC7B4B8A43369D0207AC861D8D21" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Runtime.CompilerServices.Unsafe.dll" />
</Component>
<Component Id="cmp859A3876902946E7B5B4965F90664C5D" Guid="{25192d48-42fc-4551-baec-cce4ecb420ea}">
<File Id="fil2E0E3963F95C47F3BEA7D5A5848D6F28" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Diagnostics.DiagnosticSource.dll" />
</Component>
<Component Id="cmpF1B0E6DCC3BD4797B206C879EF270062" Guid="{af38a3e7-6bc2-47c8-a83e-ee8bfd0cc8be}">
<File Id="fil2694AE6F8EB8473CBDF0F73A4E55164B" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Text.Encoding.CodePages.dll" />
</Component>
</Directory>
<Directory Id="dirC72EEAF9434D4AD066E0F4D20D8E816C" Name="en-US">
<Component Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B" Guid="{CE8DDB7C-A16E-4A1E-80D5-9937D07A1723}">
Expand Down Expand Up @@ -3062,8 +3062,8 @@
<Component Id="cmpF6FDA6202E9D4CEF9F21A23D32571BFC" Guid="{e0776aa4-b3aa-4a15-a497-697b510fba8c}">
<File Id="fil9120D0A4381F4B34B80AB37D2EFBCF7D" KeyPath="yes" Source="$(env.ProductSourcePath)\InstallPSCorePolicyDefinitions.ps1" />
</Component>
<Component Id="cmp916D506512B2490299EDA831FF6729CD" Guid="{614c1c6e-163a-4d82-accd-1f894ccac384}">
<File Id="fil5AF5BABB352B44428947D79DEBDD547A" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.46205.dll" />
<Component Id="cmpEC42F4F98D70437BB0E290A0E0FE1775" Guid="{5483092a-12c2-4e6c-b730-be491b8909c0}">
<File Id="filBE60A48C75214B7B810D695039AC47B5" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.50403.dll" />
</Component>
</DirectoryRef>
</Fragment>
Expand Down Expand Up @@ -3606,7 +3606,6 @@
<ComponentRef Id="cmpE4A3A9C6EBE34E9AAF4EB02937545542" />
<ComponentRef Id="cmp5297F3A0CC784D5FB179A2C5128882BA" />
<ComponentRef Id="cmpA5AD020C2A054BD299EA1D2439947B22" />
<ComponentRef Id="cmpB099C5A4EB94441FB3C157D6404DA2E7" />
<ComponentRef Id="cmp41E9A7E0470540228A69F13F8585089E" />
<ComponentRef Id="cmp50D8B0DCCF114B58987590FF8212ACB9" />
<ComponentRef Id="cmp0744A0E2DA694EFB97172A770E654F92" />
Expand All @@ -3632,8 +3631,6 @@
<ComponentRef Id="cmp44977EB99C0647F4941AA2711A81651F" />
<ComponentRef Id="cmp5DF3BF3BEEE34C329E690E094A3CAFA2" />
<ComponentRef Id="cmpE5F62B056F174A3E8843DFE8B70E3AA9" />
<ComponentRef Id="cmpDF06C5F29CD741FDBFDD3B3FF2134738" />
<ComponentRef Id="cmp504FA9ED665C4D148AEE907B3380AFAA" />
<ComponentRef Id="cmp0D4F53C257044BE1912BDD4E99A5F0DE" />
<ComponentRef Id="cmpEA40E9164309426C88C4388FDCA9559D" />
<ComponentRef Id="cmp30126C60BD784974B74EA45AE9B04032" />
Expand Down Expand Up @@ -3905,7 +3902,11 @@
<ComponentRef Id="cmpECBD8DFB18AD451AB3D81803DECC13BF" />
<ComponentRef Id="cmp01B3850D6E55468AA84B758FDE8CA59E" />
<ComponentRef Id="cmpF6FDA6202E9D4CEF9F21A23D32571BFC" />
<ComponentRef Id="cmp916D506512B2490299EDA831FF6729CD" />
<ComponentRef Id="cmp34649490F5B04041A08E73D7A86D5A5A" />
<ComponentRef Id="cmpB3116053008E492C9B36C89BF682B8F7" />
<ComponentRef Id="cmp859A3876902946E7B5B4965F90664C5D" />
<ComponentRef Id="cmpEC42F4F98D70437BB0E290A0E0FE1775" />
<ComponentRef Id="cmpF1B0E6DCC3BD4797B206C879EF270062" />
</ComponentGroup>
</Fragment>
</Wix>
4 changes: 2 additions & 2 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,8 +650,8 @@ function New-PSOptions {
[ValidateSet("Debug", "Release", "CodeCoverage", '')]
[string]$Configuration,

[ValidateSet("netcoreapp3.0")]
[string]$Framework = "netcoreapp3.0",
[ValidateSet("netcoreapp3.1")]
[string]$Framework = "netcoreapp3.1",

# These are duplicated from Start-PSBuild
# We do not use ValidateScript since we want tab completion
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "3.0.100"
"version": "3.1.100-preview1-014459"
}
}
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.7.0-preview1.19504.10" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.3.1" />
<PackageReference Include="System.Threading.AccessControl" Version="4.6.0" />
<PackageReference Include="System.Threading.AccessControl" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="NJsonSchema" Version="10.0.27" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.Diagnostics.EventLog" Version="4.6.0" />
<PackageReference Include="System.Diagnostics.EventLog" Version="4.7.0-preview1.19504.10" />
</ItemGroup>

</Project>
22 changes: 11 additions & 11 deletions src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.7.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.0-preview1.19504.10" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="4.6.0" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.6.0" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.6.0" />
<PackageReference Include="System.IO.Packaging" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.0-preview1.19504.10" />
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
<PackageReference Include="System.ServiceModel.Duplex" Version="4.6.0" />
<PackageReference Include="System.ServiceModel.Http" Version="4.6.0" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.6.0" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.6.0" />
<PackageReference Include="System.ServiceModel.Security" Version="4.6.0" />
<PackageReference Include="System.Private.ServiceModel" Version="4.6.0" />
<PackageReference Include="System.ServiceModel.Duplex" Version="4.7.0-preview1.final" />
<PackageReference Include="System.ServiceModel.Http" Version="4.7.0-preview1.final" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.7.0-preview1.final" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.7.0-preview1.final" />
<PackageReference Include="System.ServiceModel.Security" Version="4.7.0-preview1.final" />
<PackageReference Include="System.Private.ServiceModel" Version="4.7.0-preview1.final" />
<!-- the source could not be found for the following package(s) -->
<PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="3.0.0" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="3.1.0-preview1.19504.10" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<ProjectReference Include="..\Microsoft.WSMan.Runtime\Microsoft.WSMan.Runtime.csproj" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.7.0-preview1.19504.10" />
</ItemGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ResGen/ResGen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Generates C# typed bindings for .resx files</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<AssemblyName>resgen</AssemblyName>
<OutputType>Exe</OutputType>
<TieredCompilation>true</TieredCompilation>
Expand Down
20 changes: 10 additions & 10 deletions src/System.Management.Automation/System.Management.Automation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
<!-- the Application Insights package -->
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.6.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
<PackageReference Include="System.DirectoryServices" Version="4.6.0" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.6.0" />
<PackageReference Include="System.Management" Version="4.6.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0" />
<PackageReference Include="System.Security.AccessControl" Version="4.6.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.6.0" />
<PackageReference Include="System.Security.Permissions" Version="4.6.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="System.DirectoryServices" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="System.Management" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="System.Security.AccessControl" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="System.Security.Permissions" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0-preview1.19504.10" />
<!-- the following package(s) are from the powershell org -->
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0-preview.2" />
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.0.0-preview.2" />
Expand Down
2 changes: 1 addition & 1 deletion src/TypeCatalogGen/TypeCatalogGen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Generates CorePsTypeCatalog.cs given powershell.inc</Description>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<AssemblyName>TypeCatalogGen</AssemblyName>
<OutputType>Exe</OutputType>
<TieredCompilation>true</TieredCompilation>
Expand Down
2 changes: 1 addition & 1 deletion test/Test.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Company>Microsoft Corporation</Company>
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>

<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<LangVersion>8.0</LangVersion>

<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
2 changes: 1 addition & 1 deletion test/tools/OpenCover/OpenCover.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ function Invoke-OpenCover
[parameter()]$OutputLog = "$home/Documents/OpenCover.xml",
[parameter()]$TestPath = "${script:psRepoPath}/test/powershell",
[parameter()]$OpenCoverPath = "$home/OpenCover",
[parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/netcoreapp3.0/win7-x64/publish",
[parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/netcoreapp3.1/win7-x64/publish",
[parameter()]$PesterLogElevated = "$HOME/Documents/TestResultsElevated.xml",
[parameter()]$PesterLogUnelevated = "$HOME/Documents/TestResultsUnelevated.xml",
[parameter()]$PesterLogFormat = "NUnitXml",
Expand Down
4 changes: 2 additions & 2 deletions test/tools/WebListener/WebListener.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0-preview1.19508.20" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0-preview1.19504.10" />
</ItemGroup>

<ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions tools/packaging/packaging.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,14 @@ function Start-PSPackage {
-not $Script:Options -or ## Start-PSBuild hasn't been executed yet
-not $PSModuleRestoreCorrect -or ## Last build didn't specify '-PSModuleRestore' correctly
$Script:Options.Configuration -ne $Configuration -or ## Last build was with configuration other than 'Release'
$Script:Options.Framework -ne "netcoreapp3.0" ## Last build wasn't for CoreCLR
$Script:Options.Framework -ne "netcoreapp3.1" ## Last build wasn't for CoreCLR
} else {
-not $Script:Options -or ## Start-PSBuild hasn't been executed yet
-not $crossGenCorrect -or ## Last build didn't specify '-CrossGen' correctly
-not $PSModuleRestoreCorrect -or ## Last build didn't specify '-PSModuleRestore' correctly
$Script:Options.Runtime -ne $Runtime -or ## Last build wasn't for the required RID
$Script:Options.Configuration -ne $Configuration -or ## Last build was with configuration other than 'Release'
$Script:Options.Framework -ne "netcoreapp3.0" ## Last build wasn't for CoreCLR
$Script:Options.Framework -ne "netcoreapp3.1" ## Last build wasn't for CoreCLR
}

# Make sure the most recent build satisfies the package requirement
Expand Down Expand Up @@ -1449,7 +1449,7 @@ function CreateNugetPlatformFolder
[string] $PlatformBinPath
)

$destPath = New-Item -ItemType Directory -Path (Join-Path $PackageRuntimesFolder "$Platform/lib/netcoreapp3.0")
$destPath = New-Item -ItemType Directory -Path (Join-Path $PackageRuntimesFolder "$Platform/lib/netcoreapp3.1")
$fullPath = Join-Path $PlatformBinPath $file

if (-not(Test-Path $fullPath)) {
Expand Down Expand Up @@ -1548,7 +1548,7 @@ function New-ILNugetPackage
$packageRuntimesFolder = New-Item (Join-Path $filePackageFolder.FullName 'runtimes') -ItemType Directory

#region ref
$refFolder = New-Item (Join-Path $filePackageFolder.FullName 'ref/netcoreapp3.0') -ItemType Directory -Force
$refFolder = New-Item (Join-Path $filePackageFolder.FullName 'ref/netcoreapp3.1') -ItemType Directory -Force
CopyReferenceAssemblies -assemblyName $fileBaseName -refBinPath $refBinPath -refNugetPath $refFolder -assemblyFileList $fileList
#endregion ref

Expand Down Expand Up @@ -1915,7 +1915,7 @@ function New-ReferenceAssembly
Write-Log "Running: dotnet $arguments"
Start-NativeExecution -sb {dotnet $arguments}

$refBinPath = Join-Path $projectFolder "bin/Release/netcoreapp3.0/$assemblyName.dll"
$refBinPath = Join-Path $projectFolder "bin/Release/netcoreapp3.1/$assemblyName.dll"
if ($null -eq $refBinPath) {
throw "Reference assembly was not built."
}
Expand Down Expand Up @@ -3302,7 +3302,7 @@ function New-GlobalToolNupkg
}

$packageInfo | ForEach-Object {
$ridFolder = New-Item -Path (Join-Path $_.RootFolder "tools/netcoreapp3.0/any") -ItemType Directory
$ridFolder = New-Item -Path (Join-Path $_.RootFolder "tools/netcoreapp3.1/any") -ItemType Directory

$packageType = $_.Type

Expand Down
Loading