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

Bump .NET to 6.0.100-rc.1.21430.44 (#16028)

Browse source
This commit is contained in:
Aditya Patwardhan 2021-09-01 10:35:27 -07:00 committed by GitHub
parent 946341b2eb
commit 7fc60d1d5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DotnetRuntimeMetadata.json
View file

@ -8,6 +8,6 @@
"nextChannel": "6.0.1xx-rc1"
},
"internalfeed" : {
"url": null
"url": "https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rc.1.21430.44-shipping/nuget/v2"
}
}

6
assets/wix/files.wxs
View file

@ -3054,8 +3054,8 @@
<Component Id="cmp957498053E01454DA1E21E6D7317DCD6">
<File Id="fil2AA6F0D8A51D4BB89F33F2B73AB12391" KeyPath="yes" Source="$(var.ProductSourcePath)\msquic.dll" />
</Component>
<Component Id="cmpFF0AD067132E492DA31F4E9921B01375">
<File Id="fil2646459F2E774B48BC5FA3E7F8BED502" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.42515.dll" />
<Component Id="cmpC0B842EBB4D244718CA6CEF819EE242B">
<File Id="fil229AFC7374F34B97AC3E4296BCB45CE7" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.43011.dll" />
</Component>
</DirectoryRef>
</Fragment>
@ -4041,7 +4041,7 @@
<ComponentRef Id="cmp708913639F7A46E784CC0FA862A1A2CE" />
<ComponentRef Id="cmpA75DEF5617C54DA1937CB37D5824BF79" />
<ComponentRef Id="cmp957498053E01454DA1E21E6D7317DCD6" />
<ComponentRef Id="cmpFF0AD067132E492DA31F4E9921B01375" />
<ComponentRef Id="cmpC0B842EBB4D244718CA6CEF819EE242B" />
</ComponentGroup>
</Fragment>
</Wix>

2
global.json
View file

@ -1,5 +1,5 @@
{
"sdk": {
"version": "6.0.100-rc.1.21426.1"
"version": "6.0.100-rc.1.21430.44"
}
}

1
nuget.config
View file

@ -4,6 +4,7 @@
<clear />
<add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v2" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="dotnet-internal" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rc.1.21430.44-shipping/nuget/v2" />
</packageSources>
<disabledPackageSources>
<clear />

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="6.0.0-rc.1.21425.7" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rc.1.21430.11" />
</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="4.0.0-3.final" />
<PackageReference Include="System.Threading.AccessControl" Version="6.0.0-rc.1.21425.7" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0-rc.1.21425.7" />
<PackageReference Include="System.Threading.AccessControl" Version="6.0.0-rc.1.21430.11" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0-rc.1.21430.11" />
<PackageReference Include="NJsonSchema" Version="10.5.2" />
</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="6.0.0-rc.1.21425.7" />
<PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0-rc.1.21430.11" />
</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.2" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="6.0.0-rc.1.21425.7" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-rc.1.21425.7" />
<PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-rc.1.21425.7" />
<PackageReference Include="System.IO.Packaging" Version="6.0.0-rc.1.21430.11" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-rc.1.21430.11" />
<PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-rc.1.21430.11" />
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
<PackageReference Include="System.ServiceModel.Duplex" Version="4.9.0-preview1.21220.1" />
<PackageReference Include="System.ServiceModel.Http" Version="4.9.0-preview1.21220.1" />
@ -30,7 +30,7 @@
<PackageReference Include="System.Private.ServiceModel" Version="4.9.0-preview1.21220.1" />
<!-- 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="6.0.0-rc.1.21425.7" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.1.21430.11" />
</ItemGroup>
</Project>

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

@ -10,7 +10,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="6.0.0-rc.1.21425.7" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rc.1.21430.11" />
</ItemGroup>
<PropertyGroup>

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

@ -16,16 +16,16 @@
<!-- the Application Insights package -->
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.18.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-rc.1.21425.7" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-rc.1.21425.7" />
<PackageReference Include="System.DirectoryServices" Version="6.0.0-rc.1.21425.7" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-rc.1.21430.11" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-rc.1.21430.11" />
<PackageReference Include="System.DirectoryServices" Version="6.0.0-rc.1.21430.11" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" />
<PackageReference Include="System.Management" Version="6.0.0-rc.1.21425.7" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-rc.1.21425.7" />
<PackageReference Include="System.Management" Version="6.0.0-rc.1.21430.11" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-rc.1.21430.11" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.5.21301.5" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-rc.1.21425.7" />
<PackageReference Include="System.Security.Permissions" Version="6.0.0-rc.1.21425.7" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.1.21425.7" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-rc.1.21430.11" />
<PackageReference Include="System.Security.Permissions" Version="6.0.0-rc.1.21430.11" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.1.21430.11" />
<!-- 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.2.0-preview.2" />

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

@ -13,7 +13,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.1.21425.7" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.1.21430.11" />
</ItemGroup>
</Project>

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

@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rc.1.21425.8" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.1.21425.7" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rc.1.21430.26" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.1.21430.11" />
</ItemGroup>
<ItemGroup>

1
tools/UpdateDotnetRuntime.ps1
View file

@ -181,6 +181,7 @@ function Get-DotnetUpdate {
NewVersion = $SDKVersionOverride
Message = $null
FeedUrl = $feedUrl
Quality = $quality
}
}