Skip to content

Update to dotnet SDK 5.0.0-preview.5.20268.9 #12740

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
3 commits merged into from
May 21, 2020
Merged

Update to dotnet SDK 5.0.0-preview.5.20268.9 #12740

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
77e3ceb
Update to dotnet SDK 5.0.0-preview.5.20268.9
JamesWTruher May 20, 2020
7464b37
update mscordaccore assembly to proper version
JamesWTruher May 21, 2020
3f70d12
Update files.wxs
TravisEz13 May 21, 2020
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
6 changes: 5 additions & 1 deletion assets/files.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3099,7 +3099,10 @@
<File Id="filCE6DF8BB560F4785A4111E43CD9C14D7" KeyPath="yes" Source="$(env.ProductSourcePath)\api-ms-win-core-console-l1-2-0.dll" />
</Component>
<Component Id="cmp09D3F0FF826A4CBEB4480AD2EC9720AC" Guid="{af62d3ce-a587-4e20-ac32-2ba264c171be}">
<File Id="filE2CC950CA4B8492D860AD430BFD08E83" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.25106.dll" />
<File Id="filE2CC950CA4B8492D860AD430BFD08E83" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.26809.dll" />
</Component>
<Component Id="cmp6B528E75D2CB45E58C77F93EA7E24F80" Guid="{fb87b4f9-032d-48f3-bef8-d9e5c8e22049}">
<File Id="fil67976057061F492B9399BBF5C21ED593" KeyPath="yes" Source="$(env.ProductSourcePath)\createdump.exe" />
</Component>
</DirectoryRef>
</Fragment>
Expand Down Expand Up @@ -4100,6 +4103,7 @@
<ComponentRef Id="cmp10A3BA8FB6304CDE98FA8E6D57223EEF" />
<ComponentRef Id="cmpA57645B04E5F4D66AC598512C95AA1B9" />
<ComponentRef Id="cmp09D3F0FF826A4CBEB4480AD2EC9720AC" />
<ComponentRef Id="cmp6B528E75D2CB45E58C77F93EA7E24F80" />
</ComponentGroup>
</Fragment>
</Wix>
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 @@
{

@PoshChan PoshChan-Bot (PoshChan) May 20, 2020

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

James Truher (@JamesWTruher), your last commit had 1 failures in PowerShell-CI-windows
Enter-PSHostProcess tests.By Process Id.Can enter using NamedPipeConnectionInfo

Expected $true, but got $false.
at <ScriptBlock>, D:\a\1\s\test\powershell\Modules\Microsoft.PowerShell.Core\Enter-PSHostProcess.Tests.ps1: line 148
148:                     Should -BeTrue -Because (Get-Content $splat.FilePath -Raw)

@PoshChan PoshChan-Bot (PoshChan) May 20, 2020

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

James Truher (@JamesWTruher), your last commit had 1 failures in PowerShell-CI-windows
Enter-PSHostProcess tests.By Process Id.Can enter using NamedPipeConnectionInfo

Expected $true, but got $false.
at <ScriptBlock>, D:\a\1\s\test\powershell\Modules\Microsoft.PowerShell.Core\Enter-PSHostProcess.Tests.ps1: line 148
148:                     Should -BeTrue -Because (Get-Content $splat.FilePath -Raw)

@PoshChan PoshChan-Bot (PoshChan) May 20, 2020

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

James Truher (@JamesWTruher), your last commit had 1 failures in PowerShell-CI-windows
Enter-PSHostProcess tests.By Process Id.Can enter using NamedPipeConnectionInfo

Expected $true, but got $false.
at <ScriptBlock>, D:\a\1\s\test\powershell\Modules\Microsoft.PowerShell.Core\Enter-PSHostProcess.Tests.ps1: line 148
148:                     Should -BeTrue -Because (Get-Content $splat.FilePath -Raw)

@PoshChan PoshChan-Bot (PoshChan) May 21, 2020

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

James Truher (@JamesWTruher), your last commit had 1 failures in PowerShell-CI-windows
Enter-PSHostProcess tests.By Process Id.Can enter using NamedPipeConnectionInfo

Expected $true, but got $false.
at <ScriptBlock>, D:\a\1\s\test\powershell\Modules\Microsoft.PowerShell.Core\Enter-PSHostProcess.Tests.ps1: line 148
148:                     Should -BeTrue -Because (Get-Content $splat.FilePath -Raw)

"sdk": {
"version": "5.0.100-preview.4.20258.7"
"version": "5.0.100-preview.5.20269.29"
}
}
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 @@ -47,7 +47,7 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.5.20268.9" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions 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 @@ -32,8 +32,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.6.0" />
<PackageReference Include="System.Threading.AccessControl" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Threading.AccessControl" Version="5.0.0-preview.5.20268.9" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0-preview.5.20268.9" />
<PackageReference Include="NJsonSchema" Version="10.1.16" />
</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="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Diagnostics.EventLog" Version="5.0.0-preview.5.20268.9" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 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 @@ -18,9 +18,9 @@
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.IO.Packaging" Version="5.0.0-preview.5.20268.9" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.5.20268.9" />
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.0-preview.5.20268.9" />
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
<PackageReference Include="System.ServiceModel.Duplex" Version="4.7.0" />
<PackageReference Include="System.ServiceModel.Http" Version="4.7.0" />
Expand All @@ -30,7 +30,7 @@
<PackageReference Include="System.Private.ServiceModel" Version="4.7.0" />
<!-- 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="5.0.0-preview.4.20251.6" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0-preview.5.20268.9" />
</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="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.5.20268.9" />
</ItemGroup>

<PropertyGroup>
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.14.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.DirectoryServices" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Management" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Security.Permissions" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0-preview.5.20268.9" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-preview.5.20268.9" />
<PackageReference Include="System.DirectoryServices" Version="5.0.0-preview.5.20268.9" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0-preview.5.20268.9" />
<PackageReference Include="System.Management" Version="5.0.0-preview.5.20268.9" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.5.20268.9" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.5.20268.9" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.5.20268.9" />
<PackageReference Include="System.Security.Permissions" Version="5.0.0-preview.5.20268.9" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.5.20268.9" />
<!-- the following package(s) are from the powershell org -->
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion test/tools/TestService/TestService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0-preview.5.20268.9" />
</ItemGroup>

</Project>
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="5.0.0-preview.4.20257.10" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.0-preview.5.20269.6" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.5.20268.9" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...erence/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 @@ -14,6 +14,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.5.20268.9" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions ...aging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.5.20268.9" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0-preview.5.20268.9" />
</ItemGroup>
</Project>