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

Merge pull request #14517 from dotnet/marcpopMSFT-updaterc1build

Browse source 
Update to the just shipped RC1 version for all 7.0 templates and implicit versions
This commit is contained in:
Marc Paine 2022-09-16 14:51:22 -07:00 committed by GitHub
commit 676658081a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/Version.Details.xml
View file

@ -216,9 +216,9 @@
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>1031000fad67fa8e3f8dc67ef73611b556eb33a5</Sha> <Sha>1031000fad67fa8e3f8dc67ef73611b556eb33a5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="7.0.0-preview.7.22375.6"> <Dependency Name="Microsoft.Extensions.Logging.Console" Version="7.0.0-rc.1.22426.10.">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>eecb02807867cad56cd05badddef65e432248b75</Sha> <Sha>06aceb7015f3bd2ff019ef5920d2354eb2ea2c92</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22465.2"> <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22465.2">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri> <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

20
eng/Versions.props
View file

@ -110,16 +110,16 @@
<!-- Cross-release dependency versions --> <!-- Cross-release dependency versions -->
<MicrosoftDotNetCommonItemTemplates50PackageVersion>5.0.403</MicrosoftDotNetCommonItemTemplates50PackageVersion> <MicrosoftDotNetCommonItemTemplates50PackageVersion>5.0.403</MicrosoftDotNetCommonItemTemplates50PackageVersion>
<MicrosoftDotNetCommonItemTemplates60PackageVersion>6.0.302</MicrosoftDotNetCommonItemTemplates60PackageVersion> <MicrosoftDotNetCommonItemTemplates60PackageVersion>6.0.302</MicrosoftDotNetCommonItemTemplates60PackageVersion>
<MicrosoftDotNetCommonItemTemplates70PackageVersion>7.0.100-rc.1.22416.16</MicrosoftDotNetCommonItemTemplates70PackageVersion> <MicrosoftDotNetCommonItemTemplates70PackageVersion>7.0.100-rc.1.22429.2</MicrosoftDotNetCommonItemTemplates70PackageVersion>
<MicrosoftAspNetCoreAppRuntime50PackageVersion>5.0.13</MicrosoftAspNetCoreAppRuntime50PackageVersion> <MicrosoftAspNetCoreAppRuntime50PackageVersion>5.0.13</MicrosoftAspNetCoreAppRuntime50PackageVersion>
<MicrosoftAspNetCoreAppRuntime60PackageVersion>6.0.1</MicrosoftAspNetCoreAppRuntime60PackageVersion> <MicrosoftAspNetCoreAppRuntime60PackageVersion>6.0.1</MicrosoftAspNetCoreAppRuntime60PackageVersion>
<MicrosoftAspNetCoreAppRuntime70PackageVersion>7.0.0-rc.1.22423.7</MicrosoftAspNetCoreAppRuntime70PackageVersion> <MicrosoftAspNetCoreAppRuntime70PackageVersion>7.0.0-rc.1.22427.2</MicrosoftAspNetCoreAppRuntime70PackageVersion>
<MicrosoftWinFormsProjectTemplates50PackageVersion>5.0.17-servicing.22215.4</MicrosoftWinFormsProjectTemplates50PackageVersion> <MicrosoftWinFormsProjectTemplates50PackageVersion>5.0.17-servicing.22215.4</MicrosoftWinFormsProjectTemplates50PackageVersion>
<MicrosoftWPFProjectTemplates50PackageVersion>5.0.17-servicing.22218.2</MicrosoftWPFProjectTemplates50PackageVersion> <MicrosoftWPFProjectTemplates50PackageVersion>5.0.17-servicing.22218.2</MicrosoftWPFProjectTemplates50PackageVersion>
<MicrosoftWinFormsProjectTemplates60PackageVersion>6.0.7-servicing.22322.3</MicrosoftWinFormsProjectTemplates60PackageVersion> <MicrosoftWinFormsProjectTemplates60PackageVersion>6.0.7-servicing.22322.3</MicrosoftWinFormsProjectTemplates60PackageVersion>
<MicrosoftWPFProjectTemplates60PackageVersion>6.0.7-servicing.22322.2</MicrosoftWPFProjectTemplates60PackageVersion> <MicrosoftWPFProjectTemplates60PackageVersion>6.0.7-servicing.22322.2</MicrosoftWPFProjectTemplates60PackageVersion>
<MicrosoftWinFormsProjectTemplates70PackageVersion>7.0.0-rc.1.22362.6</MicrosoftWinFormsProjectTemplates70PackageVersion> <MicrosoftWinFormsProjectTemplates70PackageVersion>7.0.0-rc.1.22426.4</MicrosoftWinFormsProjectTemplates70PackageVersion>
<MicrosoftWPFProjectTemplates70PackageVersion>7.0.0-preview.7.22377.1</MicrosoftWPFProjectTemplates70PackageVersion> <MicrosoftWPFProjectTemplates70PackageVersion>7.0.0-rc.1.22427.1</MicrosoftWPFProjectTemplates70PackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<HostFxrVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</HostFxrVersion> <HostFxrVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</HostFxrVersion>
@ -137,12 +137,12 @@
<MicrosoftDotNetCommonProjectTemplates80PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates80PackageVersion> <MicrosoftDotNetCommonProjectTemplates80PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates80PackageVersion>
<AspNetCorePackageVersionFor80Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor80Templates> <AspNetCorePackageVersionFor80Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor80Templates>
<!-- 7.0 Template versions --> <!-- 7.0 Template versions -->
<MicrosoftDotnetWinFormsProjectTemplates70PackageVersion>7.0.0-preview.7.22376.2</MicrosoftDotnetWinFormsProjectTemplates70PackageVersion> <MicrosoftDotnetWinFormsProjectTemplates70PackageVersion>7.0.0-rc.1.22426.4</MicrosoftDotnetWinFormsProjectTemplates70PackageVersion>
<MicrosoftDotNetWpfProjectTemplates70PackageVersion>7.0.0-preview.7.22377.1</MicrosoftDotNetWpfProjectTemplates70PackageVersion> <MicrosoftDotNetWpfProjectTemplates70PackageVersion>7.0.0-rc.1.22427.1</MicrosoftDotNetWpfProjectTemplates70PackageVersion>
<NUnit3Templates70PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates70PackageVersion> <NUnit3Templates70PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates70PackageVersion>
<MicrosoftDotNetCommonItemTemplates70PackageVersion>7.0.100-rc.1.22431.7</MicrosoftDotNetCommonItemTemplates70PackageVersion> <MicrosoftDotNetCommonItemTemplates70PackageVersion>7.0.100-rc.1.22429.2</MicrosoftDotNetCommonItemTemplates70PackageVersion>
<MicrosoftDotNetCommonProjectTemplates70PackageVersion>7.0.100-rc.1.22431.7</MicrosoftDotNetCommonProjectTemplates70PackageVersion> <MicrosoftDotNetCommonProjectTemplates70PackageVersion>7.0.100-rc.1.22429.2</MicrosoftDotNetCommonProjectTemplates70PackageVersion>
<AspNetCorePackageVersionFor70Templates>7.0.0-rc.1.22423.7</AspNetCorePackageVersionFor70Templates> <AspNetCorePackageVersionFor70Templates>7.0.0-rc.1.22427.2</AspNetCorePackageVersionFor70Templates>
<!-- 6.0 Template versions --> <!-- 6.0 Template versions -->
<MicrosoftDotnetWinFormsProjectTemplates60PackageVersion>$(MicrosoftWinFormsProjectTemplates60PackageVersion)</MicrosoftDotnetWinFormsProjectTemplates60PackageVersion> <MicrosoftDotnetWinFormsProjectTemplates60PackageVersion>$(MicrosoftWinFormsProjectTemplates60PackageVersion)</MicrosoftDotnetWinFormsProjectTemplates60PackageVersion>
<MicrosoftDotNetWpfProjectTemplates60PackageVersion>$(MicrosoftWPFProjectTemplates60PackageVersion)</MicrosoftDotNetWpfProjectTemplates60PackageVersion> <MicrosoftDotNetWpfProjectTemplates60PackageVersion>$(MicrosoftWPFProjectTemplates60PackageVersion)</MicrosoftDotNetWpfProjectTemplates60PackageVersion>
@ -186,7 +186,7 @@
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion> <VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion> <DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220915-01</MicrosoftNETTestSdkVersion> <MicrosoftNETTestSdkVersion>17.4.0-preview-20220915-01</MicrosoftNETTestSdkVersion>
<MicrosoftExtensionsLoggingConsoleVersion>7.0.0-preview.7.22375.6</MicrosoftExtensionsLoggingConsoleVersion> <MicrosoftExtensionsLoggingConsoleVersion>7.0.0-rc.1.22426.10.</MicrosoftExtensionsLoggingConsoleVersion>
</PropertyGroup> </PropertyGroup>
<!-- dependencies for source-build tarball --> <!-- dependencies for source-build tarball -->
<PropertyGroup> <PropertyGroup>

2
global.json
View file

@ -3,7 +3,7 @@
"dotnet": "8.0.100-alpha.1.22423.9", "dotnet": "8.0.100-alpha.1.22423.9",
"runtimes": { "runtimes": {
"dotnet": [ "dotnet": [
"7.0.0-preview.7.22375.6" "7.0.0-rc.1.22426.10"
] ]
} }
}, },

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

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

2
test/SdkTests/SdkTests.csproj
View file

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