diff --git a/dotnet/package/Microsoft.MacCatalyst.Ref/package.csproj b/dotnet/package/Microsoft.MacCatalyst.Ref/package.csproj index 4e77b7e65d2c..3a86fe836f4e 100644 --- a/dotnet/package/Microsoft.MacCatalyst.Ref/package.csproj +++ b/dotnet/package/Microsoft.MacCatalyst.Ref/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>MacCatalyst diff --git a/dotnet/package/Microsoft.MacCatalyst.Runtime.maccatalyst-arm64/package.csproj b/dotnet/package/Microsoft.MacCatalyst.Runtime.maccatalyst-arm64/package.csproj index 82f8f23f7800..911ffa83e23f 100644 --- a/dotnet/package/Microsoft.MacCatalyst.Runtime.maccatalyst-arm64/package.csproj +++ b/dotnet/package/Microsoft.MacCatalyst.Runtime.maccatalyst-arm64/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>MacCatalyst diff --git a/dotnet/package/Microsoft.MacCatalyst.Runtime.maccatalyst-x64/package.csproj b/dotnet/package/Microsoft.MacCatalyst.Runtime.maccatalyst-x64/package.csproj index 6edb5d5bb039..90f79a667e98 100644 --- a/dotnet/package/Microsoft.MacCatalyst.Runtime.maccatalyst-x64/package.csproj +++ b/dotnet/package/Microsoft.MacCatalyst.Runtime.maccatalyst-x64/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>MacCatalyst diff --git a/dotnet/package/Microsoft.MacCatalyst.Runtime.maccatalyst/package.csproj b/dotnet/package/Microsoft.MacCatalyst.Runtime.maccatalyst/package.csproj index 283f801b74f1..15a9c2a6e262 100644 --- a/dotnet/package/Microsoft.MacCatalyst.Runtime.maccatalyst/package.csproj +++ b/dotnet/package/Microsoft.MacCatalyst.Runtime.maccatalyst/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>MacCatalyst diff --git a/dotnet/package/Microsoft.MacCatalyst.Sdk/package.csproj b/dotnet/package/Microsoft.MacCatalyst.Sdk/package.csproj index 5dbe9634099c..bb7b6c4476e7 100644 --- a/dotnet/package/Microsoft.MacCatalyst.Sdk/package.csproj +++ b/dotnet/package/Microsoft.MacCatalyst.Sdk/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>MacCatalyst diff --git a/dotnet/package/Microsoft.iOS.Ref/package.csproj b/dotnet/package/Microsoft.iOS.Ref/package.csproj index 976845f7e1b0..5110d12a6655 100644 --- a/dotnet/package/Microsoft.iOS.Ref/package.csproj +++ b/dotnet/package/Microsoft.iOS.Ref/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>iOS diff --git a/dotnet/package/Microsoft.iOS.Runtime.ios-arm/package.csproj b/dotnet/package/Microsoft.iOS.Runtime.ios-arm/package.csproj index 50bce74d22f2..e02b2f83a728 100644 --- a/dotnet/package/Microsoft.iOS.Runtime.ios-arm/package.csproj +++ b/dotnet/package/Microsoft.iOS.Runtime.ios-arm/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>iOS diff --git a/dotnet/package/Microsoft.iOS.Runtime.ios-arm64/package.csproj b/dotnet/package/Microsoft.iOS.Runtime.ios-arm64/package.csproj index 96b48bf392d0..c4adb37f2cac 100644 --- a/dotnet/package/Microsoft.iOS.Runtime.ios-arm64/package.csproj +++ b/dotnet/package/Microsoft.iOS.Runtime.ios-arm64/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>iOS diff --git a/dotnet/package/Microsoft.iOS.Runtime.ios/package.csproj b/dotnet/package/Microsoft.iOS.Runtime.ios/package.csproj index db70926ff7b5..01e0183f1175 100644 --- a/dotnet/package/Microsoft.iOS.Runtime.ios/package.csproj +++ b/dotnet/package/Microsoft.iOS.Runtime.ios/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>iOS diff --git a/dotnet/package/Microsoft.iOS.Runtime.iossimulator-arm64/package.csproj b/dotnet/package/Microsoft.iOS.Runtime.iossimulator-arm64/package.csproj index 82893d298a74..565c0df7ec6a 100644 --- a/dotnet/package/Microsoft.iOS.Runtime.iossimulator-arm64/package.csproj +++ b/dotnet/package/Microsoft.iOS.Runtime.iossimulator-arm64/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>iOS diff --git a/dotnet/package/Microsoft.iOS.Runtime.iossimulator-x64/package.csproj b/dotnet/package/Microsoft.iOS.Runtime.iossimulator-x64/package.csproj index 8b438aaed3a6..b240e10b67bf 100644 --- a/dotnet/package/Microsoft.iOS.Runtime.iossimulator-x64/package.csproj +++ b/dotnet/package/Microsoft.iOS.Runtime.iossimulator-x64/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>iOS diff --git a/dotnet/package/Microsoft.iOS.Runtime.iossimulator-x86/package.csproj b/dotnet/package/Microsoft.iOS.Runtime.iossimulator-x86/package.csproj index a91a49cb3133..79b9ff9c711c 100644 --- a/dotnet/package/Microsoft.iOS.Runtime.iossimulator-x86/package.csproj +++ b/dotnet/package/Microsoft.iOS.Runtime.iossimulator-x86/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>iOS diff --git a/dotnet/package/Microsoft.iOS.Sdk/package.csproj b/dotnet/package/Microsoft.iOS.Sdk/package.csproj index 0595c6427f89..ac679eecded6 100644 --- a/dotnet/package/Microsoft.iOS.Sdk/package.csproj +++ b/dotnet/package/Microsoft.iOS.Sdk/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>iOS diff --git a/dotnet/package/Microsoft.iOS.Windows.Sdk/package.csproj b/dotnet/package/Microsoft.iOS.Windows.Sdk/package.csproj index c3a72f936b1d..a42ec85dcd17 100644 --- a/dotnet/package/Microsoft.iOS.Windows.Sdk/package.csproj +++ b/dotnet/package/Microsoft.iOS.Windows.Sdk/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>iOS diff --git a/dotnet/package/Microsoft.macOS.Ref/package.csproj b/dotnet/package/Microsoft.macOS.Ref/package.csproj index 4a953382601c..932a2719c17a 100644 --- a/dotnet/package/Microsoft.macOS.Ref/package.csproj +++ b/dotnet/package/Microsoft.macOS.Ref/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>macOS diff --git a/dotnet/package/Microsoft.macOS.Runtime.osx-arm64/package.csproj b/dotnet/package/Microsoft.macOS.Runtime.osx-arm64/package.csproj index f3bc44ba811e..1e4531906b4f 100644 --- a/dotnet/package/Microsoft.macOS.Runtime.osx-arm64/package.csproj +++ b/dotnet/package/Microsoft.macOS.Runtime.osx-arm64/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>macOS diff --git a/dotnet/package/Microsoft.macOS.Runtime.osx-x64/package.csproj b/dotnet/package/Microsoft.macOS.Runtime.osx-x64/package.csproj index 612cbf941809..0a042c36cefb 100644 --- a/dotnet/package/Microsoft.macOS.Runtime.osx-x64/package.csproj +++ b/dotnet/package/Microsoft.macOS.Runtime.osx-x64/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>macOS diff --git a/dotnet/package/Microsoft.macOS.Runtime.osx/package.csproj b/dotnet/package/Microsoft.macOS.Runtime.osx/package.csproj index ccca0ecd19d8..32d1cd4980c1 100644 --- a/dotnet/package/Microsoft.macOS.Runtime.osx/package.csproj +++ b/dotnet/package/Microsoft.macOS.Runtime.osx/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>macOS diff --git a/dotnet/package/Microsoft.macOS.Sdk/package.csproj b/dotnet/package/Microsoft.macOS.Sdk/package.csproj index f16e08f8f12d..9e67457bbeb5 100644 --- a/dotnet/package/Microsoft.macOS.Sdk/package.csproj +++ b/dotnet/package/Microsoft.macOS.Sdk/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>macOS diff --git a/dotnet/package/Microsoft.tvOS.Ref/package.csproj b/dotnet/package/Microsoft.tvOS.Ref/package.csproj index 79f49586d540..07c4a908c680 100644 --- a/dotnet/package/Microsoft.tvOS.Ref/package.csproj +++ b/dotnet/package/Microsoft.tvOS.Ref/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>tvOS diff --git a/dotnet/package/Microsoft.tvOS.Runtime.tvos-arm64/package.csproj b/dotnet/package/Microsoft.tvOS.Runtime.tvos-arm64/package.csproj index 77370d69e25a..5690fdc2460a 100644 --- a/dotnet/package/Microsoft.tvOS.Runtime.tvos-arm64/package.csproj +++ b/dotnet/package/Microsoft.tvOS.Runtime.tvos-arm64/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>tvOS diff --git a/dotnet/package/Microsoft.tvOS.Runtime.tvos/package.csproj b/dotnet/package/Microsoft.tvOS.Runtime.tvos/package.csproj index 2fc88ff421ad..d2a6800a47f7 100644 --- a/dotnet/package/Microsoft.tvOS.Runtime.tvos/package.csproj +++ b/dotnet/package/Microsoft.tvOS.Runtime.tvos/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>tvOS diff --git a/dotnet/package/Microsoft.tvOS.Runtime.tvossimulator-arm64/package.csproj b/dotnet/package/Microsoft.tvOS.Runtime.tvossimulator-arm64/package.csproj index 566592efc1e9..607497a02ffc 100644 --- a/dotnet/package/Microsoft.tvOS.Runtime.tvossimulator-arm64/package.csproj +++ b/dotnet/package/Microsoft.tvOS.Runtime.tvossimulator-arm64/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>tvOS diff --git a/dotnet/package/Microsoft.tvOS.Runtime.tvossimulator-x64/package.csproj b/dotnet/package/Microsoft.tvOS.Runtime.tvossimulator-x64/package.csproj index 3afb52718d7b..33fd4687efae 100644 --- a/dotnet/package/Microsoft.tvOS.Runtime.tvossimulator-x64/package.csproj +++ b/dotnet/package/Microsoft.tvOS.Runtime.tvossimulator-x64/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>tvOS diff --git a/dotnet/package/Microsoft.tvOS.Sdk/package.csproj b/dotnet/package/Microsoft.tvOS.Sdk/package.csproj index d03663780040..cded6b7f809b 100644 --- a/dotnet/package/Microsoft.tvOS.Sdk/package.csproj +++ b/dotnet/package/Microsoft.tvOS.Sdk/package.csproj @@ -1,5 +1,5 @@ - + <_PlatformName>tvOS diff --git a/dotnet/package/common.csproj b/dotnet/package/common.csproj index 324c6f4e5440..c4e74e212f8b 100644 --- a/dotnet/package/common.csproj +++ b/dotnet/package/common.csproj @@ -2,7 +2,8 @@ - net$(BundledNETCoreAppTargetFrameworkVersion) + net$(BundledNETCoreAppTargetFrameworkVersion) + net10.0 false DotnetPlatform $(_PackageVersion) @@ -57,8 +58,9 @@ - - + + + diff --git a/eng/Versions.props b/eng/Versions.props index f8be90f41d50..d86bfd59bc6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,5 +6,9 @@ 8.0.0-beta.24413.2 $(MicrosoftNETSdkPackageVersion) + + 11.0.0-beta.26060.102 + + $(MicrosoftDotNetBuildTasksFeedPackageVersionNet10) diff --git a/tools/devops/automation/templates/release/vs-insertion-prep.yml b/tools/devops/automation/templates/release/vs-insertion-prep.yml index 51396fafd5b0..fa2872d392e6 100644 --- a/tools/devops/automation/templates/release/vs-insertion-prep.yml +++ b/tools/devops/automation/templates/release/vs-insertion-prep.yml @@ -212,6 +212,7 @@ stages: -p:NupkgPath=$(Build.StagingDirectory)\nuget-signed -p:PrereleaseIdentifier=$(PrereleaseIdentifier) -bl:$(Build.StagingDirectory)\maestro-binlogs\generate-bar-manifest.binlog + -p:ForceStableDotNet=true workingDirectory: $(Build.SourcesDirectory)\.. condition: and(succeeded(), eq('${{ parameters.pushNugetsToMaestro }}', 'true'))