Skip to content

Commit 3b93fd2

Browse files
bergmeisterTravisEz13
bergmeister
authored and
TravisEz13
committed
Update to .Net Core 3.0 RTM (PowerShell#10604)
1 parent becb4d9 commit 3b93fd2

File tree

13 files changed

+36
-36
lines changed

13 files changed

+36
-36
lines changed

‎.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
44
#-------------------------------------------------------------------------------------------------------------
55

6-
FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100-rc1
6+
FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100
77

88
# Avoid warnings by switching to noninteractive
99
ENV DEBIAN_FRONTEND=noninteractive

‎.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// See https://aka.ms/vscode-remote/devcontainer.json for format details.
22
{
3-
"name": ".NET Core 3.0-rc1, including pwsh (Debian 10)",
3+
"name": ".NET Core 3.0, including pwsh (Debian 10)",
44
"dockerFile": "Dockerfile",
55

66
// Uncomment the next line to run commands after the container is created.

‎assets/files.wxs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3062,8 +3062,8 @@
30623062
<Component Id="cmpF6FDA6202E9D4CEF9F21A23D32571BFC" Guid="{e0776aa4-b3aa-4a15-a497-697b510fba8c}">
30633063
<File Id="fil9120D0A4381F4B34B80AB37D2EFBCF7D" KeyPath="yes" Source="$(env.ProductSourcePath)\InstallPSCorePolicyDefinitions.ps1" />
30643064
</Component>
3065-
<Component Id="cmp954401F9FFBE447490CFAB5B129A996B" Guid="{2837e9f6-cd1d-4f2d-b1a8-4fb273801f73}">
3066-
<File Id="fil3177366E77E849449693A2F4E079E08F" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.45506.dll" />
3065+
<Component Id="cmp916D506512B2490299EDA831FF6729CD" Guid="{614c1c6e-163a-4d82-accd-1f894ccac384}">
3066+
<File Id="fil5AF5BABB352B44428947D79DEBDD547A" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.46205.dll" />
30673067
</Component>
30683068
</DirectoryRef>
30693069
</Fragment>
@@ -3905,7 +3905,7 @@
39053905
<ComponentRef Id="cmpECBD8DFB18AD451AB3D81803DECC13BF" />
39063906
<ComponentRef Id="cmp01B3850D6E55468AA84B758FDE8CA59E" />
39073907
<ComponentRef Id="cmpF6FDA6202E9D4CEF9F21A23D32571BFC" />
3908-
<ComponentRef Id="cmp954401F9FFBE447490CFAB5B129A996B" />
3908+
<ComponentRef Id="cmp916D506512B2490299EDA831FF6729CD" />
39093909
</ComponentGroup>
39103910
</Fragment>
39113911
</Wix>

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "3.0.100-rc1-014190"
3+
"version": "3.0.100"
44
}
55
}

‎src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757

5858
<ItemGroup>
5959
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
60-
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0-rc1.19456.4" />
60+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0" />
6161
</ItemGroup>
6262

6363
</Project>

‎src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656

5757
<ItemGroup>
5858
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.2.1" />
59-
<PackageReference Include="System.Threading.AccessControl" Version="4.6.0-rc1.19456.4" />
59+
<PackageReference Include="System.Threading.AccessControl" Version="4.6.0" />
6060
<PackageReference Include="NJsonSchema" Version="10.0.23" />
6161
</ItemGroup>
6262

‎src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
11-
<PackageReference Include="System.Diagnostics.EventLog" Version="4.6.0-rc1.19456.4" />
11+
<PackageReference Include="System.Diagnostics.EventLog" Version="4.6.0" />
1212
</ItemGroup>
1313

1414
</Project>

‎src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616

1717
<ItemGroup>
1818
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
19-
<PackageReference Include="System.Data.SqlClient" Version="4.7.0-rc1.19456.4" />
19+
<PackageReference Include="System.Data.SqlClient" Version="4.7.0" />
2020
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
21-
<PackageReference Include="System.IO.Packaging" Version="4.6.0-rc1.19456.4" />
22-
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.6.0-rc1.19456.4" />
23-
<PackageReference Include="System.Text.Encodings.Web" Version="4.6.0-rc1.19456.4" />
21+
<PackageReference Include="System.IO.Packaging" Version="4.6.0" />
22+
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.6.0" />
23+
<PackageReference Include="System.Text.Encodings.Web" Version="4.6.0" />
2424
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
25-
<PackageReference Include="System.ServiceModel.Duplex" Version="4.6.0-preview9.final" />
26-
<PackageReference Include="System.ServiceModel.Http" Version="4.6.0-preview9.final" />
27-
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.6.0-preview9.final" />
28-
<PackageReference Include="System.ServiceModel.Primitives" Version="4.6.0-preview9.final" />
29-
<PackageReference Include="System.ServiceModel.Security" Version="4.6.0-preview9.final" />
30-
<PackageReference Include="System.Private.ServiceModel" Version="4.6.0-preview9.final" />
25+
<PackageReference Include="System.ServiceModel.Duplex" Version="4.6.0" />
26+
<PackageReference Include="System.ServiceModel.Http" Version="4.6.0" />
27+
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.6.0" />
28+
<PackageReference Include="System.ServiceModel.Primitives" Version="4.6.0" />
29+
<PackageReference Include="System.ServiceModel.Security" Version="4.6.0" />
30+
<PackageReference Include="System.Private.ServiceModel" Version="4.6.0" />
3131
<!-- the source could not be found for the following package(s) -->
3232
<PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
33-
<PackageReference Include="Microsoft.Windows.Compatibility" Version="3.0.0-rc1.19456.4" />
33+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="3.0.0" />
3434
</ItemGroup>
3535

3636
</Project>

‎src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
1010
<ProjectReference Include="..\Microsoft.WSMan.Runtime\Microsoft.WSMan.Runtime.csproj" />
1111
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
12-
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0-rc1.19456.4" />
12+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0" />
1313
</ItemGroup>
1414

1515
<PropertyGroup>

‎src/System.Management.Automation/System.Management.Automation.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
<!-- the Application Insights package -->
1717
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0" />
1818
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
19-
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.6.0-rc1.19456.4" />
20-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0-rc1.19456.4" />
21-
<PackageReference Include="System.DirectoryServices" Version="4.6.0-rc1.19456.4" />
22-
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.6.0-rc1.19456.4" />
23-
<PackageReference Include="System.Management" Version="4.6.0-rc1.19456.4" />
24-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0-rc1.19456.4" />
25-
<PackageReference Include="System.Security.AccessControl" Version="4.6.0-rc1.19456.4" />
26-
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.6.0-rc1.19456.4" />
27-
<PackageReference Include="System.Security.Permissions" Version="4.6.0-rc1.19456.4" />
28-
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-rc1.19456.4" />
19+
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.6.0" />
20+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
21+
<PackageReference Include="System.DirectoryServices" Version="4.6.0" />
22+
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.6.0" />
23+
<PackageReference Include="System.Management" Version="4.6.0" />
24+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0" />
25+
<PackageReference Include="System.Security.AccessControl" Version="4.6.0" />
26+
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.6.0" />
27+
<PackageReference Include="System.Security.Permissions" Version="4.6.0" />
28+
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0" />
2929
<!-- the following package(s) are from the powershell org -->
3030
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0-preview.2" />
3131
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.0.0-preview.2" />

0 commit comments

Comments
 (0)