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 24334: Update global.json to 7.0.200 for v7.3.3

Browse Source
This commit is contained in:
Patrick Meinecke
2023-02-16 17:25:56 +00:00
parent d2cec425b4
commit db10b2028a
6 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Analyzers.props
+2 -2
View File
@@ -1,7 +1,7 @@
<Project>
<ItemGroup>
<PackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22217.1" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.1-preview1.23061.1" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="all" />
</ItemGroup>
</Project>
assets/wix/files.wxs
+3 -3
View File
@@ -2778,8 +2778,8 @@
<Component Id="cmp96588875574749E295496861FFC1DB58">
<File Id="filF931B05A25224A188D08E09A9FDC3A58" KeyPath="yes" Source="$(var.ProductSourcePath)\PenImc_cor3.dll" />
</Component>
<Component Id="cmpBF268557EF50438AB7374D5AAFD48780">
<File Id="filF5B0D5F1948E4854AF505B4A121B0867" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.222.60605.dll" />
<Component Id="cmpB18002F10F5542E68D2D39F0A83D9843">
<File Id="fil2B7A86F782EB4ECBA14D51D5408882C5" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.323.6910.dll" />
</Component>
</DirectoryRef>
</Fragment>
@@ -3669,7 +3669,7 @@
<ComponentRef Id="cmp42A739F2AAC24D729DDBCAA096B8C55A" />
<ComponentRef Id="cmp6986F8B66C514347A25E03DD3096B5AE" />
<ComponentRef Id="cmp96588875574749E295496861FFC1DB58" />
<ComponentRef Id="cmpBF268557EF50438AB7374D5AAFD48780" />
<ComponentRef Id="cmpB18002F10F5542E68D2D39F0A83D9843" />
</ComponentGroup>
</Fragment>
</Wix>
global.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "7.0.102"
"version": "7.0.200"
}
}
src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+2 -1
View File
@@ -17,8 +17,9 @@
<ItemGroup>
<!-- This section is to force the version of non-direct dependencies -->
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="7.0.2" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="7.0.3" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="7.0.1" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="7.0.1" />
<PackageReference Include="System.Web.Services.Description" Version="4.10.0" />
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
src/System.Management.Automation/System.Management.Automation.csproj
+4 -3
View File
@@ -22,12 +22,13 @@
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.0" />
<PackageReference Include="System.DirectoryServices" Version="7.0.0" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.1" />
<PackageReference Include="System.DirectoryServices" Version="7.0.1" />
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
<PackageReference Include="System.Management" Version="7.0.0" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.1" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="7.0.1" />
<PackageReference Include="System.Security.Permissions" Version="7.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
<!-- the following package(s) are from the powershell org -->
test/xUnit/xUnit.tests.csproj
+3 -2
View File
@@ -23,11 +23,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Validation" Version="2.4.22" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
<PackageReference Include="XunitXml.TestLogger" Version="3.0.70" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
<PackageReference Include="XunitXml.TestLogger" Version="3.0.78" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
</ItemGroup>
<ItemGroup>