diff --git a/Directory.Build.targets b/Directory.Build.targets
index 0559899f4f..5583e2ba2b 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -2,7 +2,7 @@
-
+
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 9ceeee6218..32f147ff9c 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -5,7 +5,7 @@
true
- 10.0.100-rc.2.25502.106
+ 10.0.200-preview.0.25611.111
@@ -72,8 +72,6 @@
-
-
@@ -90,7 +88,6 @@
-
@@ -106,8 +103,6 @@
-
-
diff --git a/ProjectSystem.sln b/ProjectSystem.sln
index eefd83771f..34bdf00bff 100644
--- a/ProjectSystem.sln
+++ b/ProjectSystem.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31514.227
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11114.144 d18.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "setup", "setup", "{AC8DB8AE-AC9F-4503-83C6-255B66C318C6}"
ProjectSection(SolutionItems) = preProject
@@ -81,6 +81,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{2BEDB9
src\Common\BannedSymbols.txt = src\Common\BannedSymbols.txt
EndProjectSection
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Watch.BrowserRefresh", "src\Microsoft.AspNetCore.Watch.BrowserRefresh\Microsoft.AspNetCore.Watch.BrowserRefresh.csproj", "{C45E9403-8251-B5D1-CF02-6E8367F7218E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Extensions.DotNetDeltaApplier", "src\Microsoft.Extensions.DotNetDeltaApplier\Microsoft.Extensions.DotNetDeltaApplier.csproj", "{51C57440-D5AB-889E-510A-CF81B0DA5333}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -142,6 +146,14 @@ Global
{A0B3F2BD-C92A-4037-A9F0-4EC484267E75}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A0B3F2BD-C92A-4037-A9F0-4EC484267E75}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A0B3F2BD-C92A-4037-A9F0-4EC484267E75}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C45E9403-8251-B5D1-CF02-6E8367F7218E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C45E9403-8251-B5D1-CF02-6E8367F7218E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C45E9403-8251-B5D1-CF02-6E8367F7218E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C45E9403-8251-B5D1-CF02-6E8367F7218E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {51C57440-D5AB-889E-510A-CF81B0DA5333}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {51C57440-D5AB-889E-510A-CF81B0DA5333}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {51C57440-D5AB-889E-510A-CF81B0DA5333}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {51C57440-D5AB-889E-510A-CF81B0DA5333}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -162,6 +174,8 @@ Global
{02578366-DFA9-4827-93F7-08E2AE5CE6A4} = {7349958E-C619-481F-BB2A-8A4CA2E349D9}
{A0B3F2BD-C92A-4037-A9F0-4EC484267E75} = {7349958E-C619-481F-BB2A-8A4CA2E349D9}
{2BEDB95B-AAC2-4F6D-92EA-61F07E77887E} = {1FF0293B-6808-4BB1-8370-1FE222986654}
+ {C45E9403-8251-B5D1-CF02-6E8367F7218E} = {1FF0293B-6808-4BB1-8370-1FE222986654}
+ {51C57440-D5AB-889E-510A-CF81B0DA5333} = {1FF0293B-6808-4BB1-8370-1FE222986654}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6B652C28-D1FD-4885-A0CA-4704C54E78E7}
diff --git a/eng/Build.proj b/eng/Build.proj
index af5934c661..8279742f6b 100644
--- a/eng/Build.proj
+++ b/eng/Build.proj
@@ -50,27 +50,11 @@
-
-
- $([System.IO.Path]::GetPathRoot('$(ArtifactsDir)'))
- $([System.String]::Copy('$(ArtifactsDir)').Substring(3))
-
-
-
-
-
-
-
-
- $([System.String]::Copy('%(BuildProject.FullPath)').Substring(3))
-
-
+
-
+
diff --git a/eng/imports/HostAgnostic.props b/eng/imports/HostAgnostic.props
index 4db6d16cb8..7cf81932fa 100644
--- a/eng/imports/HostAgnostic.props
+++ b/eng/imports/HostAgnostic.props
@@ -18,7 +18,6 @@
-
@@ -26,10 +25,8 @@
-
-
@@ -38,7 +35,6 @@
-
diff --git a/eng/pipelines/templates/build-pull-request.yml b/eng/pipelines/templates/build-pull-request.yml
index d80022ffe9..ad79fef80c 100644
--- a/eng/pipelines/templates/build-pull-request.yml
+++ b/eng/pipelines/templates/build-pull-request.yml
@@ -31,12 +31,19 @@ jobs:
# Ensure the .NET runtime needed by our unit tests is installed.
- task: UseDotNet@2
- displayName: Install .NET Runtime
+ displayName: Install .NET 9.0.x Runtime
inputs:
packageType: runtime
# This should match the target of our unit test projects.
version: 9.0.x
+ # .NET SDK used for build
+ - task: UseDotNet@2
+ displayName: Install .NET 10.x Runtime
+ inputs:
+ includePreviewVersions: true
+ version: 10.x
+
# Allows for accessing the internal AzDO feed (vs-impl-internal) for project restore via Azure Artifacts Credential Provider.
# See: https://github.com/microsoft/artifacts-credprovider#automatic-usage
# YAML reference: https://docs.microsoft.com/azure/devops/pipelines/tasks/package/nuget-authenticate?view=azure-devops
diff --git a/eng/pipelines/templates/generate-localization.yml b/eng/pipelines/templates/generate-localization.yml
index 94c2cad18d..8f5a2c9b72 100644
--- a/eng/pipelines/templates/generate-localization.yml
+++ b/eng/pipelines/templates/generate-localization.yml
@@ -23,9 +23,8 @@ jobs:
- task: UseDotNet@2
displayName: Install .NET Runtime
inputs:
- packageType: runtime
- # This should match the target in OneLocBuildSetup.csproj.
- version: 9.0.x
+ includePreviewVersions: true
+ version: 10.x
# Creates the LocProject.json and perform some necessary file copying and renaming.
- task: DotNetCoreCLI@2
diff --git a/global.json b/global.json
new file mode 100644
index 0000000000..b2b3bc32b0
--- /dev/null
+++ b/global.json
@@ -0,0 +1,6 @@
+{
+ "sdk": {
+ // necessary for VS to find pre-release SDKs
+ "allowPrerelease": true
+ }
+}
\ No newline at end of file
diff --git a/setup/ProjectSystemSetup/ProjectSystemSetup.csproj b/setup/ProjectSystemSetup/ProjectSystemSetup.csproj
index 5f59f9cf79..0f987cc108 100644
--- a/setup/ProjectSystemSetup/ProjectSystemSetup.csproj
+++ b/setup/ProjectSystemSetup/ProjectSystemSetup.csproj
@@ -55,6 +55,8 @@
+
+
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index e1f92ab301..8871e37836 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -12,9 +12,4 @@
false
-
-
-
-
-
diff --git a/src/HotReloadRuntimeDependencies.props b/src/HotReloadRuntimeDependencies.props
new file mode 100644
index 0000000000..13d5958298
--- /dev/null
+++ b/src/HotReloadRuntimeDependencies.props
@@ -0,0 +1,37 @@
+
+
+
+
+ Content
+ true
+ false
+ TargetFramework;TargetFrameworks
+ HotReload\net6.0
+ HotReload\net6.0\Microsoft.AspNetCore.Watch.BrowserRefresh.dll
+ PreserveNewest
+
+
+
+ Content
+ true
+ false
+ TargetFramework=net10.0
+ HotReload\net10.0
+ HotReload\net10.0\Microsoft.Extensions.DotNetDeltaApplier.dll
+ PreserveNewest
+
+
+
+ Content
+ true
+ false
+ TargetFramework=net6.0
+ HotReload\net6.0
+ HotReload\net6.0\Microsoft.Extensions.DotNetDeltaApplier.dll
+ PreserveNewest
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Watch.BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj b/src/Microsoft.AspNetCore.Watch.BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj
new file mode 100644
index 0000000000..68185f218d
--- /dev/null
+++ b/src/Microsoft.AspNetCore.Watch.BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj
@@ -0,0 +1,36 @@
+
+
+
+ net6.0
+
+
+ embedded
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ %(NuGetPackageId)\%(Link)
+
+
+ %(NuGetPackageId)\%(Link)
+ %(FileName)%(Extension)
+
+
+
diff --git a/src/Microsoft.Extensions.DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj b/src/Microsoft.Extensions.DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj
new file mode 100644
index 0000000000..c7981d41f4
--- /dev/null
+++ b/src/Microsoft.Extensions.DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj
@@ -0,0 +1,35 @@
+
+
+
+ net6.0;net10.0
+
+
+ true
+
+
+ embedded
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ %(NuGetPackageId)\%(Link)
+
+
+
diff --git a/src/Microsoft.VisualStudio.AppDesigner/Microsoft.VisualStudio.AppDesigner.vbproj b/src/Microsoft.VisualStudio.AppDesigner/Microsoft.VisualStudio.AppDesigner.vbproj
index b683bbcea6..bfffde1db2 100644
--- a/src/Microsoft.VisualStudio.AppDesigner/Microsoft.VisualStudio.AppDesigner.vbproj
+++ b/src/Microsoft.VisualStudio.AppDesigner/Microsoft.VisualStudio.AppDesigner.vbproj
@@ -23,6 +23,8 @@
+
+
ManagedCodeMarkers.vb
diff --git a/src/Microsoft.VisualStudio.Editors/Microsoft.VisualStudio.Editors.vbproj b/src/Microsoft.VisualStudio.Editors/Microsoft.VisualStudio.Editors.vbproj
index 8205be8cf6..4f927508bc 100644
--- a/src/Microsoft.VisualStudio.Editors/Microsoft.VisualStudio.Editors.vbproj
+++ b/src/Microsoft.VisualStudio.Editors/Microsoft.VisualStudio.Editors.vbproj
@@ -31,6 +31,8 @@
+
+
Designer
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Microsoft.VisualStudio.ProjectSystem.Managed.VS.csproj b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Microsoft.VisualStudio.ProjectSystem.Managed.VS.csproj
index 06b85ec326..0fe9e5ad14 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Microsoft.VisualStudio.ProjectSystem.Managed.VS.csproj
+++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Microsoft.VisualStudio.ProjectSystem.Managed.VS.csproj
@@ -40,6 +40,8 @@
+
+
Component
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/Microsoft.VisualStudio.ProjectSystem.Managed.csproj b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Microsoft.VisualStudio.ProjectSystem.Managed.csproj
index 40485cddcb..99ec0b71fa 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/Microsoft.VisualStudio.ProjectSystem.Managed.csproj
+++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Microsoft.VisualStudio.ProjectSystem.Managed.csproj
@@ -51,16 +51,13 @@
-
-
-
@@ -71,33 +68,12 @@
-
-
-
- PreserveNewest
- false
- HotReload\net6.0\Microsoft.AspNetCore.Watch.BrowserRefresh.dll
- false
-
-
- PreserveNewest
- false
- HotReload\net6.0\Microsoft.Extensions.DotNetDeltaApplier.dll
- false
-
-
- PreserveNewest
- false
- HotReload\net10.0\Microsoft.Extensions.DotNetDeltaApplier.dll
- false
-
-
-
+
+
+
+
AnalyzerReference.xaml
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/HotReload/HotReloadLogger.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/HotReload/HotReloadLogger.cs
index f8ee1a7a41..bb3fde395e 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/HotReload/HotReloadLogger.cs
+++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/HotReload/HotReloadLogger.cs
@@ -10,7 +10,8 @@ namespace Microsoft.VisualStudio.ProjectSystem.HotReload;
internal sealed class HotReloadLogger(IHotReloadDiagnosticOutputService service, string projectName, string variant, int sessionInstanceId, string categoryName) : ILogger
{
public bool IsEnabled(LogLevel logLevel)
- => true;
+ // Do not enable Trace level logging as it affects the application output
+ => logLevel >= LogLevel.Debug;
public void Log(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func formatter)
{
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests.csproj b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests.csproj
index ea02eb7c54..9c834f6d50 100644
--- a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests.csproj
+++ b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests.csproj
@@ -35,10 +35,6 @@
-
-
-
-
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests.csproj b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests.csproj
index 26ca6c1650..0324503925 100644
--- a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests.csproj
+++ b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests.csproj
@@ -18,8 +18,6 @@
-
-
\ No newline at end of file