mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'wtgodbe/FixDeps' of https://github.com/dotnet/installer into wtgodbe/FixDeps

Browse source
This commit is contained in:
MichaelSimons 2022-09-12 20:30:13 +00:00
commit ee75aae6b4
6 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/Version.Details.xml
View file

@ -174,9 +174,9 @@
<Sha>698fdad58fa64a55f16cd9562c90224cc498ed02</Sha>
<SourceBuildTarball RepoName="xdt" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="8.0.0-alpha.1.22417.1" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.8.0">
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="8.0.0-alpha.1.22462.1">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>225b08896a758167cf6b491f3369b0a1d366fc6c</Sha>
<Sha>6736b00d7d23b40b8b6975439421cb2e41a781db</Sha>
</Dependency>
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="1.0.0-preview5.1.22263.1">
<Uri>https://github.com/dotnet/deployment-tools</Uri>

12
eng/Versions.props
View file

@ -113,7 +113,7 @@
<MicrosoftDotNetCommonItemTemplates70PackageVersion>7.0.100-rc.1.22416.16</MicrosoftDotNetCommonItemTemplates70PackageVersion>
<MicrosoftAspNetCoreAppRuntime50PackageVersion>5.0.13</MicrosoftAspNetCoreAppRuntime50PackageVersion>
<MicrosoftAspNetCoreAppRuntime60PackageVersion>6.0.1</MicrosoftAspNetCoreAppRuntime60PackageVersion>
<MicrosoftAspNetCoreAppRuntime70PackageVersion>7.0.0-preview.7.22376.6</MicrosoftAspNetCoreAppRuntime70PackageVersion>
<MicrosoftAspNetCoreAppRuntime70PackageVersion>7.0.0-rc.1.22427.1</MicrosoftAspNetCoreAppRuntime70PackageVersion>
<MicrosoftWinFormsProjectTemplates50PackageVersion>5.0.17-servicing.22215.4</MicrosoftWinFormsProjectTemplates50PackageVersion>
<MicrosoftWPFProjectTemplates50PackageVersion>5.0.17-servicing.22218.2</MicrosoftWPFProjectTemplates50PackageVersion>
<MicrosoftWinFormsProjectTemplates60PackageVersion>6.0.7-servicing.22322.3</MicrosoftWinFormsProjectTemplates60PackageVersion>
@ -140,9 +140,9 @@
<MicrosoftDotnetWinFormsProjectTemplates70PackageVersion>7.0.0-preview.7.22376.2</MicrosoftDotnetWinFormsProjectTemplates70PackageVersion>
<MicrosoftDotNetWpfProjectTemplates70PackageVersion>7.0.0-preview.7.22377.1</MicrosoftDotNetWpfProjectTemplates70PackageVersion>
<NUnit3Templates70PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates70PackageVersion>
<MicrosoftDotNetCommonItemTemplates70PackageVersion>7.0.100-preview.7.22376.2</MicrosoftDotNetCommonItemTemplates70PackageVersion>
<MicrosoftDotNetCommonProjectTemplates70PackageVersion>7.0.100-preview.7.22376.2</MicrosoftDotNetCommonProjectTemplates70PackageVersion>
<AspNetCorePackageVersionFor70Templates>7.0.0-preview.7.22376.6</AspNetCorePackageVersionFor70Templates>
<MicrosoftDotNetCommonItemTemplates70PackageVersion>7.0.100-rc.1.22431.7</MicrosoftDotNetCommonItemTemplates70PackageVersion>
<MicrosoftDotNetCommonProjectTemplates70PackageVersion>7.0.100-rc.1.22431.7</MicrosoftDotNetCommonProjectTemplates70PackageVersion>
<AspNetCorePackageVersionFor70Templates>7.0.0-rc.1.22427.1</AspNetCorePackageVersionFor70Templates>
<!-- 6.0 Template versions -->
<MicrosoftDotnetWinFormsProjectTemplates60PackageVersion>$(MicrosoftWinFormsProjectTemplates60PackageVersion)</MicrosoftDotnetWinFormsProjectTemplates60PackageVersion>
<MicrosoftDotNetWpfProjectTemplates60PackageVersion>$(MicrosoftWPFProjectTemplates60PackageVersion)</MicrosoftDotNetWpfProjectTemplates60PackageVersion>
@ -220,8 +220,8 @@
<XamarinMacOSWorkloadManifestVersion>12.3.303</XamarinMacOSWorkloadManifestVersion>
<XamarinTvOSWorkloadManifestVersion>15.4.303</XamarinTvOSWorkloadManifestVersion>
<MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
<MicrosoftNETWorkloadEmscriptenManifest70100Version>8.0.0-alpha.1.22417.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</EmscriptenWorkloadManifestVersion>
<MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>8.0.0-alpha.1.22462.1</MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version)</EmscriptenWorkloadManifestVersion>
</PropertyGroup>
<PropertyGroup>
<!-- pinned dependency. This package is not being produced outside of the 2.0 branch of corefx and should not change. -->

7
src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj
View file

@ -17,8 +17,11 @@
<PackageDownload Include="Microsoft.NET.Sdk.macOS.Manifest-6.0.300" Version="[$(XamarinMacOSWorkloadManifestVersion)]" />
<PackageDownload Include="Microsoft.NET.Sdk.Maui.Manifest-6.0.300" Version="[$(MauiWorkloadManifestVersion)]" />
<PackageDownload Include="Microsoft.NET.Sdk.tvOS.Manifest-6.0.300" Version="[$(XamarinTvOSWorkloadManifestVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="[$(EmscriptenWorkloadManifestVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.Manifest-7.0.100" Version="[$(MonoWorkloadManifestVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.Manifest-8.0.100" Version="[$(MonoWorkloadManifestVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.net6.Manifest-8.0.100" Version="[$(EmscriptenWorkloadManifestVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="[$(EmscriptenWorkloadManifestVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net6.Manifest-8.0.100" Version="[$(MonoWorkloadManifestVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net7.Manifest-8.0.100" Version="[$(MonoWorkloadManifestVersion)]" />
</ItemGroup>
<!--

11
src/redist/targets/BundledManifests.targets
View file

@ -6,8 +6,11 @@
<BundledManifests Include="Microsoft.NET.Sdk.macOS" FeatureBand="6.0.300" Version="$(XamarinMacOSWorkloadManifestVersion)" />
<BundledManifests Include="Microsoft.NET.Sdk.Maui" FeatureBand="6.0.300" Version="$(MauiWorkloadManifestVersion)" />
<BundledManifests Include="Microsoft.NET.Sdk.tvOS" FeatureBand="6.0.300" Version="$(XamarinTvOSWorkloadManifestVersion)" />
<BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain" FeatureBand="7.0.100" Version="$(MonoWorkloadManifestVersion)" />
<BundledManifests Include="Microsoft.NET.Workload.Emscripten" FeatureBand="7.0.100" Version="$(EmscriptenWorkloadManifestVersion)" />
<BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain" FeatureBand="8.0.100" Version="$(MonoWorkloadManifestVersion)" />
<BundledManifests Include="Microsoft.NET.Workload.Emscripten.net6" FeatureBand="8.0.100" Version="$(EmscriptenWorkloadManifestVersion)" />
<BundledManifests Include="Microsoft.NET.Workload.Emscripten.net7" FeatureBand="8.0.100" Version="$(EmscriptenWorkloadManifestVersion)" />
<BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain.net6" FeatureBand="8.0.100" Version="$(MonoWorkloadManifestVersion)" />
<BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain.net7" FeatureBand="8.0.100" Version="$(MonoWorkloadManifestVersion)" />
</ItemGroup>
<!-- Calculate NuGet package IDs for bundled manifests -->
@ -53,8 +56,8 @@
<ItemGroup>
<!-- Don't try to validate signing for workload manifests that will be signed as part of post-build signing -->
<BundledManifestsToValidateSigning Include="@(BundledManifests)"
Exclude="Microsoft.NET.Workload.Mono.ToolChain;
Microsoft.NET.Workload.Emscripten" />
Condition="!$([System.String]::new(%(BundledManifests.Identity)).StartsWith('Microsoft.NET.Workload.Mono.ToolChain')) and
!$([System.String]::new(%(BundledManifests.Identity)).StartsWith('Microsoft.NET.Workload.Emscripten'))" />
<SignCheckWorkloadManifestMsiInputFiles Include="@(BundledManifestsToValidateSigning->'%(RestoredMsiPathInNupkg)')" />
</ItemGroup>

12
src/redist/targets/GenerateBundledVersions.targets
View file

@ -77,12 +77,12 @@
<_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</_NETCorePlatformsPackageVersion>
<!-- TODO: Once .NET 7.0 has released, update these version numbers to 7.0.0 -->
<_NET70RuntimePackVersion>7.0.0-preview.7.22375.6</_NET70RuntimePackVersion>
<_NET70TargetingPackVersion>7.0.0-preview.7.22375.6</_NET70TargetingPackVersion>
<_WindowsDesktop70RuntimePackVersion>7.0.0-preview.7.22377.1</_WindowsDesktop70RuntimePackVersion>
<_WindowsDesktop70TargetingPackVersion>7.0.0-preview.7.22377.1</_WindowsDesktop70TargetingPackVersion>
<_AspNet70RuntimePackVersion>7.0.0-preview.7.22376.6</_AspNet70RuntimePackVersion>
<_AspNet70TargetingPackVersion>7.0.0-preview.7.22376.6</_AspNet70TargetingPackVersion>
<_NET70RuntimePackVersion>7.0.0-rc.1.22427.1</_NET70RuntimePackVersion>
<_NET70TargetingPackVersion>7.0.0-rc.1.22427.1</_NET70TargetingPackVersion>
<_WindowsDesktop70RuntimePackVersion>7.0.0-rc.1.22431.18</_WindowsDesktop70RuntimePackVersion>
<_WindowsDesktop70TargetingPackVersion>7.0.0-rc.1.22431.18</_WindowsDesktop70TargetingPackVersion>
<_AspNet70RuntimePackVersion>7.0.0-rc.1.22426.10</_AspNet70RuntimePackVersion>
<_AspNet70TargetingPackVersion>7.0.0-rc.1.22426.10</_AspNet70TargetingPackVersion>
<_NET60RuntimePackVersion>6.0.$(VersionFeature60)</_NET60RuntimePackVersion>
<_NET60TargetingPackVersion>6.0.$(VersionFeature60)</_NET60TargetingPackVersion>

2
test/SdkTests/SdkTests.csproj
View file

@ -63,7 +63,7 @@
<RuntimeVersionToInstall Include="3.1.0" />
<RuntimeVersionToInstall Include="5.0.0" />
<RuntimeVersionToInstall Include="6.0.0" />
<RuntimeVersionToInstall Include="7.0.0-preview.7.22375.6" />
<RuntimeVersionToInstall Include="7.0.0-rc.1.22427.1" />
</ItemGroup>
</Target>