Browse Source

bump up VS redist to 9.0 (#9865)

move to a newer vs redist to ensure coherency in the windows desktop repo, see https://github.com/dotnet/windowsdesktop/pull/3841 for details

Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
pull/9892/head
Tanya Solyanik 2 years ago
committed by GitHub
parent
commit
0d5f3ab325
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      Directory.Build.targets
  2. 2
      docs/testing-in-vs.md
  3. 4
      eng/Version.Details.xml
  4. 2
      eng/Versions.props
  5. 4
      global.json

8
Directory.Build.targets

@ -74,14 +74,14 @@
<ItemGroup>
<!-- Set TargetingPackVersion -->
<FrameworkReference Update="Microsoft.NETCore.App"
Condition=" '$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)'!='' And $(TargetFramework.StartsWith('$(RedistTargetFrameworkName)')) ">
<TargetingPackVersion>$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)</TargetingPackVersion>
Condition=" '$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)'!='' And $(TargetFramework.StartsWith('$(RedistTargetFrameworkName)')) ">
<TargetingPackVersion>$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)</TargetingPackVersion>
</FrameworkReference>
</ItemGroup>
<PropertyGroup>
<!-- Set RuntimeFrameworkVersion to VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion from Core Setup to prevent large SDK cycle -->
<RuntimeFrameworkVersion Condition="'$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)'!='' And $(TargetFramework.StartsWith('$(RedistTargetFrameworkName)')) ">$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)</RuntimeFrameworkVersion>
<!-- Set RuntimeFrameworkVersion to VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion from Core Setup to prevent large SDK cycle -->
<RuntimeFrameworkVersion Condition="'$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)'!='' And $(TargetFramework.StartsWith('$(RedistTargetFrameworkName)')) ">$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)</RuntimeFrameworkVersion>
<!-- If TargetFramework is not net8.x, then reset RuntimeFrameworkVersion -->
<RuntimeFrameworkVersion Condition="!$(TargetFramework.StartsWith('$(RedistTargetFrameworkName)'))" />

2
docs/testing-in-vs.md

@ -44,7 +44,7 @@ There are two ways to get around this problem:
* If you’re interested in seeing what this version is, look at `<yourRepoRoot>\.dotnet\sdk\<yourSdkVersion>\dotnet.runtimeconfig.json`
* The winforms (runtime) repo DOES specify an explicit NetCore.App version, and we use the one published by the core-setup repo.
* If you look at [Directory.Build.Targets](https://github.com/dotnet/winforms/blob/ac0426561b158522eb8564de2bedd28f28148f8d/Directory.Build.targets#L35), you can see where this is set
* `$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)` is set in [Versions.props](https://github.com/dotnet/winforms/blob/ac0426561b158522eb8564de2bedd28f28148f8d/eng/Versions.props#L19), and gets automatically updated when we ingest dependencies from core-setup. (These PR's are automatically merged in if the build passes)
* `$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)` is set in [Versions.props](https://github.com/dotnet/winforms/blob/ac0426561b158522eb8564de2bedd28f28148f8d/eng/Versions.props#L19), and gets automatically updated when we ingest dependencies from core-setup. (These PR's are automatically merged in if the build passes)
* You can see where the dependency comes from by looking at [Version.Details.xml](https://github.com/dotnet/winforms/blob/ac0426561b158522eb8564de2bedd28f28148f8d/eng/Version.Details.xml#L13)
* The reason we use the version from core-setup instead of the version built-in to the SDK is we don’t want to wait for the runtime to come all the way through the SDK repo to consume it
* Running tests from the command line (.\build -test) works because the build scripts automatically download both the sdk AND the NetCore.App that you need AND add the .dotnet folder to your PATH when running.

4
eng/Version.Details.xml

@ -7,9 +7,9 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
-->
<Dependencies>
<ProductDependencies>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-rc.1.23421.3">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.23430.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
<Sha>03d25cd9f3868c92554e27048a57c49a39ce07c9</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-alpha.1.23460.2">
<Uri>https://github.com/dotnet/runtime</Uri>

2
eng/Versions.props

@ -12,7 +12,7 @@
</PropertyGroup>
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-rc.1.23421.3</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.23453.3</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
<SystemDiagnosticsEventLogPackageVersion>9.0.0-alpha.1.23460.2</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>9.0.0-alpha.1.23460.2</SystemDirectoryServicesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>9.0.0-alpha.1.23460.2</SystemReflectionMetadataLoadContextPackageVersion>

4
global.json

@ -3,10 +3,10 @@
"dotnet": "8.0.100-preview.7.23376.3",
"runtimes": {
"dotnet/x64": [
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
],
"dotnet/x86": [
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
]
}
},

Loading…
Cancel
Save