admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged PR 11552: Bump .NET SDK version to v2.1.18

Browse Source 
Bump .NET SDK version to v2.1.18
This commit is contained in:
Aditya Patwardhan
2020-05-13 17:23:11 +00:00
parent 3ceddd0dce
commit 7352e33479
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PowerShell.Common.props
+2 -2
View File
@@ -94,8 +94,8 @@
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RuntimeFrameworkVersion>2.1.13</RuntimeFrameworkVersion>
<LangVersion>Latest</LangVersion>
<RuntimeFrameworkVersion>2.1.18</RuntimeFrameworkVersion>
<LangVersion>preview</LangVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
assets/files.wxs
+7 -7
View File
@@ -2182,14 +2182,14 @@
</Component>
</Directory>
</Directory>
<Component Id="cmp7A79FF035BB843E89DC22E9EEEFFD3A0" Guid="{c02ae51e-ed46-4e0d-91ea-8a997ad72043}">
<File Id="fil056AD29D20A4403181A4C294922D62E6" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.28008.01.dll" />
</Component>
<Component Id="cmp003E42DEEEA8449C88B2A23B92E0AE39" Guid="{50d7aa94-fcaa-4418-8a7f-2cafd3dee77c}">
<File Id="fil58F60CDE7E154249820022F5280A3C80" KeyPath="yes" Source="$(env.ProductSourcePath)\Markdig.Signed.dll" />
</Component>
<Component Id="cmpDE9E274B93E34380A2CD5E73CC0EC71D" Guid="{7664d7b9-3462-4438-b32b-d6887f9f1bc9}">
<File Id="filD28EB9CE1D5A4998AAB7D6C1532B37AA" KeyPath="yes" Source="$(env.ProductSourcePath)\sos_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.28008.01.dll" />
<Component Id="cmp351C4E9343494D3C81FC34343AA26D1F" Guid="{c196ea10-885e-4163-b483-65dd331f1862}">
<File Id="fil430268F524C449AAB127F08E5A99F9AA" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.28801.04.dll" />
</Component>
<Component Id="cmp8A8E3654239C4329B500A3D95ABEFD84" Guid="{57f2f618-79ca-4359-a398-21aaa373d1d7}">
<File Id="fil9FD43D3A46EF49CD9778468785197EB3" KeyPath="yes" Source="$(env.ProductSourcePath)\sos_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.28801.04.dll" />
</Component>
</DirectoryRef>
</Fragment>
@@ -2887,9 +2887,9 @@
<ComponentRef Id="cmpC1D0D334836C4821B04087DDFE167637" />
<ComponentRef Id="cmp75D079D2DE8545BB962554C7EFE6A37C" />
<ComponentRef Id="cmp8A4E5A03C2644F199C7395C8EA350F65" />
<ComponentRef Id="cmp7A79FF035BB843E89DC22E9EEEFFD3A0" />
<ComponentRef Id="cmp003E42DEEEA8449C88B2A23B92E0AE39" />
<ComponentRef Id="cmpDE9E274B93E34380A2CD5E73CC0EC71D" />
<ComponentRef Id="cmp351C4E9343494D3C81FC34343AA26D1F" />
<ComponentRef Id="cmp8A8E3654239C4329B500A3D95ABEFD84" />
</ComponentGroup>
</Fragment>
</Wix>
global.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "2.1.509"
"version": "2.1.806"
}
}
src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
+1 -1
View File
@@ -9,7 +9,7 @@
<ItemGroup>
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<!-- the following package(s) are from https://github.com/microsoft/applicationinsights-??? -->
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.12.0" />
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.12.2" />
</ItemGroup>
<PropertyGroup>
src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+1 -1
View File
@@ -20,7 +20,7 @@
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="4.5.0" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.5.4" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.0" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.1" />
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
<PackageReference Include="System.ServiceModel.Duplex" Version="4.5.3" />
<PackageReference Include="System.ServiceModel.Http" Version="4.5.3" />
src/System.Management.Automation/System.Management.Automation.csproj
+1 -1
View File
@@ -16,7 +16,7 @@
<PackageReference Include="System.DirectoryServices" Version="4.5.0" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.5.0" />
<PackageReference Include="System.Management" Version="4.5.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" />
<PackageReference Include="System.Security.AccessControl" Version="4.5.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.5.2" />
<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+1 -1
View File
@@ -1076,7 +1076,7 @@ dir -Recurse `
$res = TabExpansion2 -inputScript $inputStr -cursorColumn $inputStr.Length
$res.CompletionMatches.Count | Should -BeGreaterThan 0
$res.CompletionMatches[0].CompletionText | Should -BeExactly $expected
$res.CompletionMatches[0].CompletionText | Should -Be $expected
}
}