maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update .NET SDK version from 5.0.100-preview.6.20318.15 to 5.0.100-preview.7.20356.2 (#13125)

Browse source
This commit is contained in:
github-actions[bot] 2020-07-07 12:10:11 -07:00 committed by GitHub
parent d3addeb3da
commit 7da0742cb6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 37 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
assets/files.wxs
View file

@ -1624,6 +1624,9 @@
<Component Id="cmp19ADFEFDD03047828CF493B5B5CE7B6E">
<File Id="filCE65C019A32144BB9E9CCA3D5E634E32" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Net.Http.Json.dll" />
</Component>
<Component Id="cmp72C41225E0B4457C8CB5F4C5FE6E3187" Guid="{ee32f38f-14ee-4a85-914f-d02522cc3635}">
<File Id="fil04B0F83A7AED430A86A7E6E3E99AB45D" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Formats.Asn1.dll" />
</Component>
</Directory>
<Directory Id="dirC72EEAF9434D4AD066E0F4D20D8E816C" Name="en-US">
<Component Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B">
@ -3100,8 +3103,11 @@
<Component Id="cmp7BDE558CCB344A399134DE2C9E2C8D3D">
<File Id="filF907AD3E73324DEA94AE90E9625AFA73" KeyPath="yes" Source="$(env.ProductSourcePath)\api-ms-win-core-console-l1-2-0.dll" />
</Component>
<Component Id="cmpB321E2183FC841689A36A414D1BC9649" Guid="{bcae0883-dbde-4f85-8966-01611cb3fe28}">
<File Id="filB5A732A745E84838B30D7430359A91D3" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.30506.dll" />
<Component Id="cmpE1E7639528734B309511FDEF767420DE" Guid="{28cffd06-864a-4bb1-ba28-c1caf051e79d}">
<File Id="fil87341D30746143929DA9777EEDAA7CC7" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.32601.dll" />
</Component>
<Component Id="cmp0BD7D15E0377407FA4C43BFE89F0C12E" Guid="{73b408fe-e910-4106-ae07-c21bc029f1d3}">
<File Id="fil6EF5C2AED8674A32B0F3CCEE9CBEED71" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Formats.Asn1.dll" />
</Component>
</DirectoryRef>
</Fragment>
@ -4102,7 +4108,9 @@
<ComponentRef Id="cmpE9599A00802144DF98F5792E029C8875" />
<ComponentRef Id="cmp0989343D60B74AF082291F612F0E6FA6" />
<ComponentRef Id="cmp7BDE558CCB344A399134DE2C9E2C8D3D" />
<ComponentRef Id="cmpB321E2183FC841689A36A414D1BC9649" />
<ComponentRef Id="cmpE1E7639528734B309511FDEF767420DE" />
<ComponentRef Id="cmp72C41225E0B4457C8CB5F4C5FE6E3187" />
<ComponentRef Id="cmp0BD7D15E0377407FA4C43BFE89F0C12E" />
</ComponentGroup>
</Fragment>
</Wix>

2
global.json
View file

@ -1,5 +1,5 @@
{
"sdk": {
"version": "5.0.100-preview.6.20318.15"
"version": "5.0.100-preview.7.20356.2"
}
}

2
src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
View file

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

4
src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file

@ -32,8 +32,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.6.0" />
<PackageReference Include="System.Threading.AccessControl" Version="5.0.0-preview.6.20305.6" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0-preview.6.20305.6" />
<PackageReference Include="System.Threading.AccessControl" Version="5.0.0-preview.7.20326.1" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0-preview.7.20326.1" />
<PackageReference Include="NJsonSchema" Version="10.1.23" />
</ItemGroup>

2
src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View file

@ -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.6.20305.6" />
<PackageReference Include="System.Diagnostics.EventLog" Version="5.0.0-preview.7.20326.1" />
</ItemGroup>
</Project>

8
src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file

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

2
src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
View file

@ -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.6.20305.6" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.7.20326.1" />
</ItemGroup>
<PropertyGroup>

20
src/System.Management.Automation/System.Management.Automation.csproj
View file

@ -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.6.20305.6" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-preview.6.20305.6" />
<PackageReference Include="System.DirectoryServices" Version="5.0.0-preview.6.20305.6" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0-preview.6.20305.6" />
<PackageReference Include="System.Management" Version="5.0.0-preview.6.20305.6" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.6.20305.6" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.6.20305.6" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.6.20305.6" />
<PackageReference Include="System.Security.Permissions" Version="5.0.0-preview.6.20305.6" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.6.20305.6" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0-preview.7.20326.1" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-preview.7.20326.1" />
<PackageReference Include="System.DirectoryServices" Version="5.0.0-preview.7.20326.1" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0-preview.7.20326.1" />
<PackageReference Include="System.Management" Version="5.0.0-preview.7.20326.1" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.7.20326.1" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.7.20326.1" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.7.20326.1" />
<PackageReference Include="System.Security.Permissions" Version="5.0.0-preview.7.20326.1" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.7.20326.1" />
<!-- 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" />

2
test/tools/TestService/TestService.csproj
View file

@ -12,7 +12,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0-preview.6.20305.6" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0-preview.7.20326.1" />
</ItemGroup>
</Project>

4
test/tools/WebListener/WebListener.csproj
View file

@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.0-preview.6.20312.15" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.6.20305.6" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.0-preview.7.20356.7" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.7.20326.1" />
</ItemGroup>
<ItemGroup>

2
tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file

@ -14,6 +14,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.6.20305.6" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.7.20326.1" />
</ItemGroup>
</Project>

4
tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
View file

@ -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.6.20305.6" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0-preview.6.20305.6" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.7.20326.1" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0-preview.7.20326.1" />
</ItemGroup>
</Project>