Skip to content

Add alpha branding #50468

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.

Sign up for GitHub

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

Open
wants to merge 24 commits into
base: main
Choose a base branch
from
Open

Add alpha branding #50468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
4a93bbe
Add alpha branding
Aug 25, 2025
37b9b76
Pin the template versions temporarily to unblock the build
Aug 25, 2025
1c23bbe
Fix CodeAnalysis build error
Aug 25, 2025
f620b25
test the changes for the template intaller
Aug 26, 2025
a888e6a
Update BundedTemplates.targets file
Aug 26, 2025
0ff8d3d
Update VS.Redist.NetCore.Templates.proj file
Aug 26, 2025
e00bf88
Update BundledTemplates.targets file
Aug 26, 2025
58adfbd
Update BundledTemplates.targets file
Aug 26, 2025
2acc7f0
Update the codes according the suggestions
Aug 27, 2025
4199d77
Set default TFM to 10.0
jjonescz Sep 10, 2025
01e88d4
Merge branch 'main' into dev/Simon/alphabranding
SimonZhao888 Oct 13, 2025
01c08c2
Merge branch 'main' into dev/Simon/alphabranding
SimonZhao888 Oct 20, 2025
20f2d0d
Merge branch 'main' into dev/Simon/alphabranding
SimonZhao888 Oct 29, 2025
68608ed
Merge branch 'main' into dev/Simon/alphabranding
SimonZhao888 Oct 30, 2025
4177ab2
Disabel the failed test cases due to issue 51491
Oct 30, 2025
09969f7
Disable failed test case
Oct 30, 2025
f479b75
Merge branch 'main' into dev/Simon/alphabranding
SimonZhao888 Oct 31, 2025
a7c811f
Merge branch 'main' into dev/Simon/alphabranding
SimonZhao888 Oct 31, 2025
b014166
Skip BlazorWasm_Restart test on Windows platform
marcpopMSFT Oct 31, 2025
5ef2c6d
Merge branch 'main' into dev/Simon/alphabranding
marcpopMSFT Nov 3, 2025
ed199df
Merge branch 'main' into dev/Simon/alphabranding
marcpopMSFT Nov 5, 2025
f7288c5
Update Microsoft.CodeAnalysis.NetAnalyzers baselines
jeffhandley Nov 6, 2025
ccb2bb0
Disable a few more watch tests that are failing because of the 11 update
marcpopMSFT Nov 6, 2025
ab48695
Update rc.1 to GA
DonnaChen888 Nov 11, 2025
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
5 changes: 3 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
<PropertyGroup Label="Repo version information">
<VersionMajor>10</VersionMajor>
<VersionMajor>11</VersionMajor>
<VersionMinor>0</VersionMinor>
<VersionSDKMinor>2</VersionSDKMinor>
<VersionFeature>00</VersionFeature>
Expand All @@ -14,13 +14,14 @@
<SdkFeatureBand>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)00</SdkFeatureBand>
<BuiltinWorkloadFeatureBand>$(VersionMajor).$(VersionMinor).100</BuiltinWorkloadFeatureBand>
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
<PreviousVersionPrefix>10.0.100</PreviousVersionPrefix>
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
<CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
<!-- Enable to remove prerelease label. -->
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
<!-- Calculate prerelease label -->
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">preview</PreReleaseVersionLabel>
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">alpha</PreReleaseVersionLabel>
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and $(VersionPrefix.EndsWith('00'))">rtm</PreReleaseVersionLabel>
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and !$(VersionPrefix.EndsWith('00'))">servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">0</PreReleaseVersionIteration>
Expand Down
15 changes: 1 addition & 14 deletions src/Cli/Microsoft.DotNet.Cli.Utils/Product.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public static class Product
{
public static string LongName => LocalizableStrings.DotNetSdkInfo;
public static readonly string Version;
public static readonly string TargetFrameworkVersion;
public static readonly string TargetFrameworkVersion = "10.0";

static Product()
{
Expand All @@ -19,18 +19,5 @@ static Product()
typeof(Product).GetTypeInfo().Assembly.Location)
.ProductVersion ??
string.Empty;

int firstDotIndex = Version.IndexOf('.');
if (firstDotIndex >= 0)
{
int secondDotIndex = Version.IndexOf('.', firstDotIndex + 1);
TargetFrameworkVersion = secondDotIndex >= 0
? Version.Substring(0, secondDotIndex)
: Version;
}
else
{
TargetFrameworkVersion = string.Empty;
}
}
}
3 changes: 2 additions & 1 deletion src/Layout/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
<FullNugetVersion Condition="'$(VersionSuffixDateStamp)' != '' and '$(VersionSuffixBuildOfTheDay)' != ''">$(FullNugetVersion).$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay)</FullNugetVersion>

<PgoTerm Condition="'$(PgoInstrument)' == 'true'">-pgo</PgoTerm>
<ArtifactNameWithVersionSdk>dotnet-sdk-internal$(PgoTerm)-$(FullNugetVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdk>
<!-- <ArtifactNameWithVersionSdk>dotnet-sdk-internal$(PgoTerm)-$(FullNugetVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdk> -->
<ArtifactNameWithVersionSdk>dotnet-sdk-internal$(PgoTerm)-10.0.100-rtm-$(ProductMonikerRid)</ArtifactNameWithVersionSdk>
<ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>dotnet-sdk$(PgoTerm)-$(Version)-$(ProductMonikerRid)</ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>

<SdkMSIInstallerFileName>$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkMSIInstallerFileName>
Expand Down
3 changes: 2 additions & 1 deletion src/Layout/VS.Redist.Common.NetCore.Templates/VS.Redist.Common.NetCore.Templates.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@

<Target Name="GenerateLayout" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="ResolveProjectReferences">
<ItemGroup>
<Content Include="$(ArtifactsNonShippingPackagesDir)dotnet-$(VersionMajor)$(VersionMinor)templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)" PackagePath="/" />
<!-- <Content Include="$(ArtifactsNonShippingPackagesDir)dotnet-$(VersionMajor)$(VersionMinor)templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)" PackagePath="/" /> -->
<Content Include="$(ArtifactsNonShippingPackagesDir)dotnet-100templates-10.0.100-rtm-$(ProductMonikerRid)$(InstallerExtension)" PackagePath="/" />
</ItemGroup>
</Target>

Expand Down
18 changes: 15 additions & 3 deletions src/Layout/redist/targets/BundledTemplates.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
</ItemGroup>

<ItemGroup>
<CurrentVersionBundledTemplates Include="@(Bundled100Templates)" TemplateFrameworkVersion="$(MajorMinorVersion)" />
<!-- <CurrentVersionBundledTemplates Include="@(Bundled100Templates)" TemplateFrameworkVersion="$(MajorMinorVersion)" /> -->
<CurrentVersionBundledTemplates Include="@(Bundled100Templates)" TemplateFrameworkVersion="10.0" />
<BundledTemplates Include="@(CurrentVersionBundledTemplates)" />
<BundledTemplates Update="@(BundledTemplates)">
<NupkgPathRelativeToPackageRoot>%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg</NupkgPathRelativeToPackageRoot>
Expand All @@ -28,19 +29,30 @@
<_ArcadePatchNumber>$([MSBuild]::ValueOrDefault('$(_PatchNumber)', '000000'))</_ArcadePatchNumber>
</PropertyGroup>

<CalculateTemplateVersions
<!-- <CalculateTemplateVersions
BundledTemplates="@(BundledTemplates)"
FullNugetVersion="$(FullNugetVersion)"
ProductMonikerRid="$(ProductMonikerRid)"
InstallerExtension="$(InstallerExtension)"
CombinedBuildNumberAndRevision="$(_ArcadePatchNumber)">
<Output TaskParameter="BundledTemplatesWithInstallPaths" ItemName="BundledTemplatesWithInstallPaths" />
<Output TaskParameter="TemplatesComponents" ItemName="TemplatesComponents" />
</CalculateTemplateVersions> -->

<CalculateTemplateVersions
BundledTemplates="@(BundledTemplates)"
FullNugetVersion="10.0.100-rtm"
ProductMonikerRid="$(ProductMonikerRid)"
InstallerExtension="$(InstallerExtension)"
CombinedBuildNumberAndRevision="$(_ArcadePatchNumber)">
<Output TaskParameter="BundledTemplatesWithInstallPaths" ItemName="BundledTemplatesWithInstallPaths" />
<Output TaskParameter="TemplatesComponents" ItemName="TemplatesComponents" />
</CalculateTemplateVersions>

<ItemGroup>
<TemplatesComponents>
<MSIInstallerFile>$(ArtifactsNonShippingPackagesDir)%(TemplatesComponents.TemplateBaseFilename)-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</MSIInstallerFile>
<!-- <MSIInstallerFile>$(ArtifactsNonShippingPackagesDir)%(TemplatesComponents.TemplateBaseFilename)-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</MSIInstallerFile> -->
<MSIInstallerFile>$(ArtifactsNonShippingPackagesDir)%(TemplatesComponents.TemplateBaseFilename)-10.0.100-rtm-$(ProductMonikerRid)$(InstallerExtension)</MSIInstallerFile>
</TemplatesComponents>
</ItemGroup>
</Target>
Expand Down
4 changes: 3 additions & 1 deletion src/Layout/redist/targets/GenerateMSIs.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@
Outputs="$(SdkBundleFile)">
<!-- Choose "latest" template MSI to go in bundle. -->
<ItemGroup>
<LatestTemplateInstallerComponent Include="@(TemplatesMsi)" Condition="'%(TemplatesMajorMinorVersion)' == '$(MajorMinorVersion)'"/>
<!-- While we don't have 11.0 templates available (need SDK update, choose the 10.0 templates -->
<!-- <LatestTemplateInstallerComponent Include="@(TemplatesMsi)" Condition="'%(TemplatesMajorMinorVersion)' == '$(MajorMinorVersion)'"/> -->
<LatestTemplateInstallerComponent Include="@(TemplatesMsi)" Condition="'%(TemplatesMajorMinorVersion)' == '10.0'"/>
</ItemGroup>

<PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/Layout/redist/targets/RestoreLayout.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
<DownloadedWindowsDesktopTargetingPackInstallerFileName Condition="'$(InstallerExtension)' != ''">windowsdesktop-targeting-pack-$(MicrosoftWindowsDesktopAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWindowsDesktopTargetingPackInstallerFileName>

<SdkMSIInstallerFileName>$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkMSIInstallerFileName>
<SdkTemplatesMSIInstallerFileName>dotnet-$(VersionMajor)$(VersionMinor)templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</SdkTemplatesMSIInstallerFileName>
<!-- <SdkTemplatesMSIInstallerFileName>dotnet-$(VersionMajor)$(VersionMinor)templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</SdkTemplatesMSIInstallerFileName> -->
<SdkTemplatesMSIInstallerFileName>dotnet-100templates-10.0.100-rtm-$(ProductMonikerRid)$(InstallerExtension)</SdkTemplatesMSIInstallerFileName>

<CombinedFrameworkHostArchiveFileName>dotnet-runtime-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostArchiveFileName>
<WinFormsAndWpfSharedFxArchiveFileName>windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>
Expand Down
2 changes: 1 addition & 1 deletion ...icrosoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.Package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<_GenerateDocumentationAndConfigFilesPath>%(_GenerateDocumentationAndConfigFilesPath.Identity)</_GenerateDocumentationAndConfigFilesPath>
</PropertyGroup>

<Exec Command='"$(DotNetTool)" "$(_GenerateDocumentationAndConfigFilesPath)" "-validateOnly:$(ValidateOnlyFlag)" "$(GeneratedRulesetsDir)" "$(GeneratedEditorconfigsDir)" "$(GeneratedGlobalAnalyzerConfigsDir)" "$(ArtifactsBinDir)$(EscapeDirectorySuffix)" "$(Configuration)" "$(TargetFramework)" "@(AnalyzerNupkgAssembly)" "$(PackagePropsTargetsFileDir)" "$(PackagePropsFileName)" "$(PackagePropsTargetsFileDir)" "$(PackageTargetsFileName)" "$(DisableNETAnalyzersPackagePropsFileName)" "$(AnalyzerDocumentationFileDir)" "$(AnalyzerDocumentationFileName)" "$(AnalyzerSarifFileDir)" "$(AnalyzerSarifFileName)" "$(VersionPrefix)" $(PackageId) $(ContainsPortedFxCopRules) $(GenerateAnalyzerRulesMissingDocumentationFile) $(ReleaseTrackingOptOut) $(_ValidateOffline)' />
<Exec Command='"$(DotNetTool)" "$(_GenerateDocumentationAndConfigFilesPath)" "-validateOnly:$(ValidateOnlyFlag)" "$(GeneratedRulesetsDir)" "$(GeneratedEditorconfigsDir)" "$(GeneratedGlobalAnalyzerConfigsDir)" "$(ArtifactsBinDir)$(EscapeDirectorySuffix)" "$(Configuration)" "$(TargetFramework)" "@(AnalyzerNupkgAssembly)" "$(PackagePropsTargetsFileDir)" "$(PackagePropsFileName)" "$(PackagePropsTargetsFileDir)" "$(PackageTargetsFileName)" "$(DisableNETAnalyzersPackagePropsFileName)" "$(AnalyzerDocumentationFileDir)" "$(AnalyzerDocumentationFileName)" "$(AnalyzerSarifFileDir)" "$(AnalyzerSarifFileName)" "$(PreviousVersionPrefix)" $(PackageId) $(ContainsPortedFxCopRules) $(GenerateAnalyzerRulesMissingDocumentationFile) $(ReleaseTrackingOptOut) $(_ValidateOffline)' />
</Target>

</Project>
6 changes: 3 additions & 3 deletions src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.sarif
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{
"tool": {
"name": "Microsoft.CodeAnalysis.CSharp.NetAnalyzers",
"version": "10.0.200",
"version": "10.0.100",
"language": "en-US"
},
"rules": {
Expand Down Expand Up @@ -708,7 +708,7 @@
{
"tool": {
"name": "Microsoft.CodeAnalysis.NetAnalyzers",
"version": "10.0.200",
"version": "10.0.100",
"language": "en-US"
},
"rules": {
Expand Down Expand Up @@ -6603,7 +6603,7 @@
{
"tool": {
"name": "Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers",
"version": "10.0.200",
"version": "10.0.100",
"language": "en-US"
},
"rules": {
Expand Down
4 changes: 0 additions & 4 deletions src/Microsoft.CodeAnalysis.NetAnalyzers/src/RulesMissingDocumentation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@

Rule ID | Missing Help Link | Title |
--------|-------------------|-------|
CA1873 | <https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1873> | Avoid potentially expensive logging |
CA1874 | <https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1874> | Use 'Regex.IsMatch' |
CA1875 | <https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1875> | Use 'Regex.Count' |
CA2023 | <https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca2023> | Invalid braces in message template |
2 changes: 1 addition & 1 deletion test/dotnet-watch.Tests/Browser/BrowserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public async Task LaunchesBrowserOnStart()
App.AssertOutputContains(MessageDescriptor.LaunchingBrowser.GetMessage("https://localhost:5001", ""));
}

[PlatformSpecificFact(TestPlatforms.Windows)] // https://github.com/dotnet/aspnetcore/issues/63759
[PlatformSpecificFact(TestPlatforms.Windows, Skip = "https://github.com/dotnet/sdk/issues/51491")] // https://github.com/dotnet/aspnetcore/issues/63759
public async Task BrowserDiagnostics()
{
var testAsset = TestAssets.CopyTestAsset("WatchRazorWithDeps")
Expand Down
2 changes: 1 addition & 1 deletion test/dotnet-watch.Tests/CommandLine/ProgramTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ public async Task PublishCommand()
App.AssertOutputContains(Path.Combine("Release", ToolsetInfo.CurrentTargetFramework, "publish"));
}

[Fact]
[Fact(Skip="https://github.com/dotnet/sdk/issues/51491")]
public async Task FormatCommand()
{
var testAsset = TestAssets.CopyTestAsset("WatchNoDepsApp")
Expand Down
Loading
Loading