diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 2a596551a4..db6c5b64c6 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -3,7 +3,7 @@ # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information. #------------------------------------------------------------------------------------------------------------- -FROM mcr.microsoft.com/dotnet/nightly/sdk:5.0.100-rc.1 +FROM mcr.microsoft.com/dotnet/nightly/sdk:5.0.100-rc.2 # Avoid warnings by switching to noninteractive ENV DEBIAN_FRONTEND=noninteractive diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json index d6c02300df..562987a835 100644 --- a/DotnetRuntimeMetadata.json +++ b/DotnetRuntimeMetadata.json @@ -1,8 +1,8 @@ { "sdk": { - "channel": "release/5.0.1xx-rc1", - "packageVersionPattern": "5.0.0-rc.1", - "sdkImageVersion": "5.0.100-rc.1", - "nextChannel": "net5/rc1" + "channel": "release/5.0.1xx-rc2", + "packageVersionPattern": "5.0.0-rc.2", + "sdkImageVersion": "5.0.100-rc.2", + "nextChannel": "net5/rc2" } } diff --git a/assets/files.wxs b/assets/files.wxs index 5a41fda7d2..0e88acb1d7 100644 --- a/assets/files.wxs +++ b/assets/files.wxs @@ -1623,12 +1623,6 @@ - - - - - - @@ -1990,9 +1984,6 @@ - - - @@ -2055,9 +2046,6 @@ - - - @@ -2084,9 +2072,6 @@ - - - @@ -2146,9 +2131,6 @@ - - - @@ -2241,9 +2223,6 @@ - - - @@ -2288,9 +2267,6 @@ - - - @@ -2368,9 +2344,6 @@ - - - @@ -2397,9 +2370,6 @@ - - - @@ -2486,9 +2456,6 @@ - - - @@ -2554,9 +2521,6 @@ - - - @@ -2619,9 +2583,6 @@ - - - @@ -2654,9 +2615,6 @@ - - - @@ -2743,9 +2701,6 @@ - - - @@ -3099,14 +3054,11 @@ - - + + - - - - - + + @@ -3744,7 +3696,6 @@ - @@ -3765,7 +3716,6 @@ - @@ -3774,7 +3724,6 @@ - @@ -3794,7 +3743,6 @@ - @@ -3825,7 +3773,6 @@ - @@ -3840,7 +3787,6 @@ - @@ -3866,7 +3812,6 @@ - @@ -3875,7 +3820,6 @@ - @@ -3904,7 +3848,6 @@ - @@ -3926,7 +3869,6 @@ - @@ -3947,7 +3889,6 @@ - @@ -3958,7 +3899,6 @@ - @@ -3987,7 +3927,6 @@ - @@ -4105,11 +4044,8 @@ - - - - - + + diff --git a/global.json b/global.json index 1780ad8789..6ba5ef7c3c 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "5.0.100-rc.1.20452.10" + "version": "5.0.100-rc.2.20479.15" } } diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj index 88727c9d96..3b2d17ac71 100644 --- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj +++ b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj @@ -47,7 +47,7 @@ - + diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj index 75784f6229..e7af9d058d 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj +++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj @@ -32,8 +32,8 @@ - - + + diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj index 8b3cf14f58..45c89f20c8 100644 --- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj +++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj index 72119525b6..79202cc9ac 100644 --- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj +++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj @@ -18,9 +18,9 @@ - - - + + + @@ -30,7 +30,7 @@ - + diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj index 96fd6a0a7e..852dddbc1e 100644 --- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj +++ b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj index 767d2877a9..a4b7d3620e 100644 --- a/src/System.Management.Automation/System.Management.Automation.csproj +++ b/src/System.Management.Automation/System.Management.Automation.csproj @@ -16,16 +16,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj index 9e5f96b310..e482ebb88c 100644 --- a/test/tools/TestService/TestService.csproj +++ b/test/tools/TestService/TestService.csproj @@ -13,7 +13,7 @@ - + diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj index 45ce62fa73..5f38ac883c 100644 --- a/test/tools/WebListener/WebListener.csproj +++ b/test/tools/WebListener/WebListener.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj index 0dc3e0f672..d84de42a3e 100644 --- a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj +++ b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj @@ -14,6 +14,6 @@ - + diff --git a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj index 3651a22939..fe6a4be725 100644 --- a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj +++ b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj @@ -9,7 +9,7 @@ - - + +