Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions DotnetRuntimeMetadata.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"sdk": {
Comment thread
rjmholt marked this conversation as resolved.
"channel": "release/5.0.1xx-preview7",
"packageVersionPattern": "5.0.0-preview.7",
"sdkImageVersion": "5.0.100-preview.7",
"nextChannel": "net5/preview7"
"channel": "release/5.0.1xx-preview8",
"packageVersionPattern": "5.0.0-preview.8",
"sdkImageVersion": "5.0.100-preview.8",
"nextChannel": "net5/preview8"
}
}
8 changes: 4 additions & 4 deletions assets/files.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -3105,12 +3105,12 @@
<Component Id="cmpC0FFB3F4FB30438082D2DC0F4E4BF12D">
<File Id="fil8FEEEB3B27DF40148EB85CE6AE1A420B" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.DiaSymReader.Native.$(var.FileArchitecture).dll" />
</Component>
<Component Id="cmpF65478926051451688800150DBAEE4BC">
<File Id="fil99692697F55D4B1B9D28FDBD439A11BA" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.36411.dll" />
</Component>
<Component Id="cmp5485813EC16244898CB9A944AC2BC5E9">
<File Id="fil6EA784763CF94299BC6E75DF068F05A3" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.PowerShell.Pager.dll" />
</Component>
<Component Id="cmp9AFE828DDCCC4A0E83C4D7476B353023">
<File Id="filBE5924015B7147E5BE1D6CDEB8AFB6C3" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.40711.dll" />
</Component>
</DirectoryRef>
</Fragment>
<Fragment>
Expand Down Expand Up @@ -4112,8 +4112,8 @@
<ComponentRef Id="cmp72C41225E0B4457C8CB5F4C5FE6E3187" />
<ComponentRef Id="cmp0BD7D15E0377407FA4C43BFE89F0C12E" />
<ComponentRef Id="cmpC0FFB3F4FB30438082D2DC0F4E4BF12D" />
<ComponentRef Id="cmpF65478926051451688800150DBAEE4BC" />
<ComponentRef Id="cmp5485813EC16244898CB9A944AC2BC5E9" />
<ComponentRef Id="cmp9AFE828DDCCC4A0E83C4D7476B353023" />
</ComponentGroup>
</Fragment>
</Wix>
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "5.0.100-preview.7.20366.15"
"version": "5.0.100-preview.8.20417.9"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,14 @@ public static FilterRule DeepCopy(this FilterRule rule)
FilterRule copy = null;
try
{
#pragma warning disable MSLIB0003
formatter.Serialize(ms, rule);
#pragma warning restore MSLIB0003

ms.Position = 0;
#pragma warning disable MSLIB0003
copy = (FilterRule)formatter.Deserialize(ms);
#pragma warning restore MSLIB0003
}
finally
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="15.0">
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<Import Project="..\..\PowerShell.Common.props" />
<PropertyGroup>
<Description>Assembly containing WPF code for Out-GridView, HelpWindow, and Show-Command</Description>
<NoWarn>$(NoWarn);CS1570</NoWarn>
<RootNamespace>Microsoft.Management.UI.Internal</RootNamespace>
<AssemblyName>Microsoft.PowerShell.GraphicalHost</AssemblyName>
<UseWPF>True</UseWPF>
<TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
<TargetPlatformVersion>7.0</TargetPlatformVersion>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just curious, what does the TargetPlatformVersion mean? Meaning targeting win-7?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Yes, that is the OS version

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We might have to have separate Win7 and Win10 packages as I think it's required to set this to 10 to pull in the WinRT packages

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Can we try setting this to 10 in a private branch and see if that helps the WinRT issue?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I'm doing a local build to verify this

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think it is too late in the release to generate 2 packages for windows. We should do that for 7.2 if needed.

</PropertyGroup>

<PropertyGroup>
Expand Down
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.7.20364.11" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.8.20365.6" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -784,8 +784,10 @@ private static string RetrieveProcessUserName(Process process)
// The buffer length must be +1, last position is for a null string terminator.
int userNameLength = 257;
int domainNameLength = 16;
#pragma warning disable CA2014
Span<char> userNameStr = stackalloc char[userNameLength];
Span<char> domainNameStr = stackalloc char[domainNameLength];
#pragma warning restore CA2014
Win32Native.SID_NAME_USE accountType;

// userNameLength and domainNameLength will be set to actual lengths.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.7.0" />
<PackageReference Include="System.Threading.AccessControl" Version="5.0.0-preview.7.20364.11" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0-preview.7.20364.11" />
<PackageReference Include="System.Threading.AccessControl" Version="5.0.0-preview.8.20365.6" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0-preview.8.20365.6" />
<PackageReference Include="NJsonSchema" Version="10.1.24" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2576,7 +2576,9 @@ internal static void WriteConsole(ConsoleHandle consoleHandle, ReadOnlySpan<char
{
var endOfLine = Environment.NewLine.AsSpan();
var endOfLineLength = endOfLine.Length;
#pragma warning disable CA2014
Span<char> outBufferLine = stackalloc char[outBuffer.Length + endOfLineLength];
#pragma warning restore CA2014
Comment thread
daxian-dbw marked this conversation as resolved.
outBuffer.CopyTo(outBufferLine);
endOfLine.CopyTo(outBufferLine.Slice(outBufferLine.Length - endOfLineLength));
WriteConsole(consoleHandle, outBufferLine);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,9 @@ private object ReadLineSafe(bool isSecureString, char? printToken)
ConsoleKeyInfo keyInfo = Console.ReadKey(true);
#else
const int CharactersToRead = 1;
#pragma warning disable CA2014
Span<char> inputBuffer = stackalloc char[CharactersToRead + 1];
#pragma warning restore CA2014
string key = ConsoleControl.ReadConsole(handle, initialContentLength: 0, inputBuffer, charactersToRead: CharactersToRead, endOnTab: false, out _);
#endif

Expand Down
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.7.20364.11" />
<PackageReference Include="System.Diagnostics.EventLog" Version="5.0.0-preview.8.20365.6" />
</ItemGroup>

</Project>
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.7.20364.11" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.7.20364.11" />
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.0-preview.7.20364.11" />
<PackageReference Include="System.IO.Packaging" Version="5.0.0-preview.8.20365.6" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.8.20365.6" />
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.0-preview.8.20365.6" />
<!-- 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.7.20364.11" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0-preview.8.20365.6" />
</ItemGroup>

</Project>
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.7.20364.11" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.8.20365.6" />
</ItemGroup>

<PropertyGroup>
Expand Down
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.7.20364.11" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-preview.7.20364.11" />
<PackageReference Include="System.DirectoryServices" Version="5.0.0-preview.7.20364.11" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0-preview.7.20364.11" />
<PackageReference Include="System.Management" Version="5.0.0-preview.7.20364.11" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.7.20364.11" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.7.20364.11" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.7.20364.11" />
<PackageReference Include="System.Security.Permissions" Version="5.0.0-preview.7.20364.11" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.7.20364.11" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0-preview.8.20365.6" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-preview.8.20365.6" />
<PackageReference Include="System.DirectoryServices" Version="5.0.0-preview.8.20365.6" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0-preview.8.20365.6" />
<PackageReference Include="System.Management" Version="5.0.0-preview.8.20365.6" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.8.20365.6" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.8.20365.6" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.8.20365.6" />
<PackageReference Include="System.Security.Permissions" Version="5.0.0-preview.8.20365.6" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.8.20365.6" />
<!-- 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
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,9 @@ internal static byte[] GetCurrentTimeZoneInByteFormat()
BinaryFormatter formatter = new BinaryFormatter();
using (MemoryStream stream = new MemoryStream())
{
#pragma warning disable MSLIB0003
formatter.Serialize(stream, TimeZoneInfo.Local);
#pragma warning restore MSLIB0003
stream.Seek(0, SeekOrigin.Begin);
byte[] result = new byte[stream.Length];
stream.Read(result, 0, (int)stream.Length);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7617,9 +7617,9 @@ public Encoding Encoding

set
{
#pragma warning disable 612, 618
if (value == System.Text.Encoding.UTF7)
#pragma warning restore 612, 618
// Check for UTF-7 by checking for code page 65000
// See: https://docs.microsoft.com/en-us/dotnet/core/compatibility/corefx#utf-7-code-paths-are-obsolete
if (value != null && value.CodePage == 65000)
Comment thread
rjmholt marked this conversation as resolved.
{
_provider.WriteWarning(PathUtilsStrings.Utf7EncodingObsolete);
}
Expand Down
8 changes: 5 additions & 3 deletions src/System.Management.Automation/utils/EncodingUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ internal static class EncodingConversion
{ Default, ClrFacade.GetDefaultEncoding() },
{ OEM, ClrFacade.GetOEMEncoding() },
{ Unicode, System.Text.Encoding.Unicode },
#pragma warning disable MSLIB0001
{ Utf7, System.Text.Encoding.UTF7 },
#pragma warning restore MSLIB0001
{ Utf8, ClrFacade.GetDefaultEncoding() },
{ Utf8Bom, System.Text.Encoding.UTF8 },
{ Utf8NoBom, ClrFacade.GetDefaultEncoding() },
Expand Down Expand Up @@ -95,9 +97,9 @@ internal static Encoding Convert(Cmdlet cmdlet, string encoding)
/// <param name="encoding">The encoding to check for obsolescence.</param>
internal static void WarnIfObsolete(Cmdlet cmdlet, Encoding encoding)
{
#pragma warning disable 612, 618
if (encoding == System.Text.Encoding.UTF7)
#pragma warning restore 612, 618
// Check for UTF-7 by checking for code page 65000
// See: https://docs.microsoft.com/en-us/dotnet/core/compatibility/corefx#utf-7-code-paths-are-obsolete
if (encoding != null && encoding.CodePage == 65000)
{
cmdlet.WriteWarning(PathUtilsStrings.Utf7EncodingObsolete);
}
Expand Down
20 changes: 5 additions & 15 deletions src/powershell-win-core/powershell-win-core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,11 @@
<RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers>
<RootNamespace>Microsoft.PowerShell</RootNamespace>
<ApplicationManifest>..\..\assets\pwsh.manifest</ApplicationManifest>
<TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
<TargetPlatformVersion>7.0</TargetPlatformVersion>
</PropertyGroup>

<!-- Have default so this builds in Visual Studio -->
<PropertyGroup Condition = "'$(SDKToUse)' == ''">
<SDKToUse>Microsoft.NET.Sdk.WindowsDesktop</SDKToUse>
</PropertyGroup>

<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" Condition="'$(SDKToUse)' == 'Microsoft.NET.Sdk' " />
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition="'$(SDKToUse)' == 'Microsoft.NET.Sdk' " />

<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" Condition="'$(SDKToUse)' == 'Microsoft.NET.Sdk.WindowsDesktop' " />
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" Condition="'$(SDKToUse)' == 'Microsoft.NET.Sdk.WindowsDesktop' " />

<PropertyGroup Condition="'$(SDKToUse)' == 'Microsoft.NET.Sdk.WindowsDesktop' ">
<UseWpf>true</UseWpf>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />

<ItemGroup>
<Compile Include="..\powershell\Program.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
Expand Down Expand Up @@ -64,4 +52,6 @@
<ProjectReference Include="..\Microsoft.Management.UI.Internal\Microsoft.PowerShell.GraphicalHost.csproj" Condition="'$(SDKToUse)' == 'Microsoft.NET.Sdk.WindowsDesktop' "/>
</ItemGroup>

<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Shall we move this above next to <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We can try, but this was the recommendation from the .NET team member.


</Project>
2 changes: 1 addition & 1 deletion test/tools/TestService/TestService.csproj
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.7.20364.11" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0-preview.8.20365.6" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions test/tools/WebListener/WebListener.csproj
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.7.20365.19" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.7.20364.11" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.0-preview.8.20364.8" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.8.20365.6" />
</ItemGroup>

<ItemGroup>
Expand Down
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.7.20364.11" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.8.20365.6" />
</ItemGroup>
</Project>
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.7.20364.11" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0-preview.7.20364.11" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.8.20365.6" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0-preview.8.20365.6" />
</ItemGroup>
</Project>