Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry" Version="6.0.0-preview.6.21314.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="6.0.0-preview.7.21317.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
Expand Down Expand Up @@ -79,18 +75,10 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
</Dependency>
<Dependency Name="System.Security.AccessControl" Version="6.0.0-preview.6.21314.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-preview.7.21317.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
</Dependency>
<Dependency Name="System.Security.Principal.Windows" Version="6.0.0-preview.6.21314.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="6.0.0-preview.7.21317.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
Expand All @@ -107,14 +95,6 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
</Dependency>
<Dependency Name="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.6.21314.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
</Dependency>
<Dependency Name="System.IO.Pipes.AccessControl" Version="6.0.0-preview.6.21314.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Pkcs" Version="6.0.0-preview.7.21317.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
Expand All @@ -135,10 +115,6 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-preview.7.21317.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.7.21317.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "6.0.100-preview.4.21255.9",
"dotnet": "6.0.100-preview.6.21317.3",
"runtimes": {
"dotnet/x64": [
"$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
Expand All @@ -11,7 +11,7 @@
}
},
"sdk": {
"version": "6.0.100-preview.4.21255.9"
"version": "6.0.100-preview.6.21317.3"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wondering why the sdk update was necessary? Isn't the runtime flowing through the VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion variable?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't believe it does. IIRC this is something that repos must do manually.

},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21316.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
<PackageReference Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
<PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonPackageVersion)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<PackageReference Include="xunit.stafact" Version="$(XUnitStaFactPackageVersion)" />
<PackageReference Include="xunit.assert" Version="$(XUnitAssertVersion)" />
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsPackageVersion)" />
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/System.Windows.Forms/src/System.Windows.Forms.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
<PackageReference Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
<PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonPackageVersion)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<PackageReference Include="xunit.assert" Version="$(XUnitAssertVersion)" />
<PackageReference Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" />
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsPackageVersion)" />
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down