Skip to content

Commit b5edcab

Browse files
authored
Remove dotnet6 feeds (#66447)
* Remove dotnet6 feeds dotnet7 feeds are currently the target feeds for the main branch. The dotnet6 feeds shouldn't be used anymore. * Update targetingpacks.targets * Update prebuilt package versions * Update NativeExports.csproj
1 parent 05cb7f5 commit b5edcab

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

NuGet.config

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
<!-- TODO: Remove dotnet7 feeds when dependencies publish into dotnet8 feeds: https://github.com/dotnet/runtime/issues/63375. -->
1919
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
2020
<add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
21-
<!-- TODO: Remove dotnet6 feeds when dependencies publish into dotnet7 feeds: https://github.com/dotnet/runtime/issues/57716. -->
22-
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
23-
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
2421
<!-- Used for the Rich Navigation indexing task -->
2522
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
2623
</packageSources>

eng/targetingpacks.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<EnableTargetingPackDownload>false</EnableTargetingPackDownload>
2424
<GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
2525
<!-- Hardcode the apphost version until the SDK understands the net7.0 tfm. -->
26-
<_AppHostBaselinePackVersion Condition="'$(UseLocalAppHostPack)' != 'true'">6.0.0-rc.1.21411.2</_AppHostBaselinePackVersion>
26+
<_AppHostBaselinePackVersion Condition="'$(UseLocalAppHostPack)' != 'true'">6.0.3</_AppHostBaselinePackVersion>
2727
</PropertyGroup>
2828

2929
<!-- Add Known* items if the SDK doesn't support the TargetFramework yet. -->

src/installer/tests/Assets/TestUtils/TestProjects.targets

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
<KnownFrameworkReference Include="Microsoft.NETCore.App"
1616
TargetFramework="net7.0"
1717
RuntimeFrameworkName="Microsoft.NETCore.App"
18-
DefaultRuntimeFrameworkVersion="6.0.0-rc.1.21411.2"
19-
LatestRuntimeFrameworkVersion="6.0.0-rc.1.21411.2"
18+
DefaultRuntimeFrameworkVersion="6.0.3"
19+
LatestRuntimeFrameworkVersion="6.0.3"
2020
TargetingPackName="Microsoft.NETCore.App.Ref"
21-
TargetingPackVersion="6.0.0-rc.1.21411.2"
21+
TargetingPackVersion="6.0.3"
2222
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**"
2323
RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;maccatalyst-x64;maccatalyst-arm64" />
2424

2525
<KnownAppHostPack Include="Microsoft.NETCore.App"
2626
TargetFramework="net7.0"
2727
AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**"
28-
AppHostPackVersion="6.0.0-rc.1.21411.2"
28+
AppHostPackVersion="6.0.3"
2929
AppHostRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64" />
3030
</ItemGroup>
3131
</Project>

src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
</PropertyGroup>
7474
<PropertyGroup Condition="'$(TargetOS)' == 'OSX'">
7575
<TargetTriple Condition="'$(TargetArchitecture)' == 'arm64'">arm64-apple-macos11</TargetTriple>
76-
<TargetTriple Condition="'$(TargetArchitecture)' == 'x64'">x86_64-apple-macos10.13</TargetTriple>
76+
<TargetTriple Condition="'$(TargetArchitecture)' == 'x64'">x86_64-apple-macos10.14</TargetTriple>
7777
<XCodeSdkName>macosx</XCodeSdkName>
7878
</PropertyGroup>
7979

0 commit comments

Comments
 (0)