Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert to latest public preview of the .NET SDK #32203

Merged
1 commit merged into from
Nov 6, 2023
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
7 changes: 0 additions & 7 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,6 @@
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
<Import Project="eng\testing\linker\trimmingTests.targets" Condition="'$(IsPublishedAppTestProject)' == 'true'" />

<ItemGroup>
<FrameworkReference Update="Microsoft.NETCore.App"
Condition="'$(TargetFramework)' == 'net9.0'"
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimewinx64Version)"
TargetingPackVersion="$(MicrosoftNETCoreAppRefVersion)" />
</ItemGroup>

<Target Name="GetCustomAssemblyAttributes"
BeforeTargets="GetAssemblyAttributes"
Condition=" '$(MSBuildProjectExtension)' == '.csproj' "
Expand Down
13 changes: 0 additions & 13 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e733539a38458c5c3a64688b55a702444e470700</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-alpha.1.23556.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e733539a38458c5c3a64688b55a702444e470700</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-alpha.1.23556.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e733539a38458c5c3a64688b55a702444e470700</Sha>
</Dependency>
<!-- NB: Using BrowserDebugHost to represent the nonshipping version of Microsoft.NETCore.App -->
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="9.0.0-alpha.1.23556.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e733539a38458c5c3a64688b55a702444e470700</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23553.1">
Expand Down
3 changes: 0 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.0-alpha.1.23556.1</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>9.0.0-alpha.1.23556.1</MicrosoftExtensionsLoggingVersion>
<SystemTextJsonVersion>9.0.0-alpha.1.23556.1</SystemTextJsonVersion>
<MicrosoftNETCoreAppRefVersion>9.0.0-alpha.1.23556.1</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-alpha.1.23556.1</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.0-alpha.1.23556.1</MicrosoftNETCoreBrowserDebugHostTransportVersion>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/arcade">
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.23553.1</MicrosoftDotNetBuildTasksTemplatingVersion>
Expand Down
4 changes: 0 additions & 4 deletions eng/helix.proj
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@
</PropertyGroup>

<ItemGroup>
<AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)">
<PackageType>runtime</PackageType>
</AdditionalDotNetPackage>

<AdditionalDotNetPackageFeed Include="https://dotnetbuilds.blob.core.windows.net/internal"
Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal'">
<SasToken>$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))</SasToken>
Expand Down
9 changes: 2 additions & 7 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
{
"sdk": {
"version": "8.0.100-rtm.23506.1",
"version": "8.0.100-rc.2.23502.2",
"allowPrerelease": true,
"rollForward": "latestMajor"
},
"tools": {
"dotnet": "8.0.100-rtm.23506.1",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
]
}
"dotnet": "8.0.100-rc.2.23502.2"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23553.1",
Expand Down
Loading