Skip to content

Alpha Branding #42743

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

Merged
merged 10 commits into from
Aug 27, 2024
Merged

Alpha Branding #42743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a31b24f
Alpha Branding
marcpopMSFT Aug 14, 2024
426b043
Pin the template versions temporarily to unblock the build
marcpopMSFT Aug 16, 2024
0c5b3eb
Add skip attribute to failing test
v-wuzhai Aug 20, 2024
8919a25
Continue skipping the failed test
v-wuzhai Aug 20, 2024
f8977c6
fix the theory skip attribute
marcpopMSFT Aug 20, 2024
b1bfa3c
HotRestart test is timing out
marcpopMSFT Aug 21, 2024
3a0b1fc
skipping the failed test UpdateAndRudeEdit
v-wuzhai Aug 21, 2024
fbf3c27
Merge branch 'main' of https://github.com/dotnet/sdk into marcpopMSFT…
v-wuzhai Aug 21, 2024
51c30cc
Update SdkContentTests.cs
mmitche Aug 21, 2024
572498f
Disable the dotnetformat sourcebuild test
marcpopMSFT Aug 26, 2024
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
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
<PropertyGroup Label="Repo version information">
<VersionMajor>9</VersionMajor>
<VersionMajor>10</VersionMajor>
<VersionMinor>0</VersionMinor>
<VersionSDKMinor>1</VersionSDKMinor>
<VersionFeature>00</VersionFeature>
Expand All @@ -19,7 +19,7 @@
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
<!-- Calculate prerelease label -->
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">rc</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'">1</PreReleaseVersionIteration>
Expand Down
5 changes: 4 additions & 1 deletion src/Installer/redist-installer/targets/GenerateMSIs.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,11 @@
Outputs="$(CombinedFrameworkSdkHostMSIInstallerFile)">
<!-- Choose "latest" template MSI to go in bundle. -->
<ItemGroup>
<!-- While we don't have 10.0 templates available (need SDK update, choose the 9.0 templates -->
<!-- <LatestTemplateInstallerComponent Include="@(TemplatesMsiComponent)"
Condition="'%(TemplatesMajorMinorVersion)' == '$(MajorMinorVersion)'"/> -->
<LatestTemplateInstallerComponent Include="@(TemplatesMsiComponent)"
Condition="'%(TemplatesMajorMinorVersion)' == '$(MajorMinorVersion)'" />
Condition="'%(TemplatesMajorMinorVersion)' == '9.0'"/>
</ItemGroup>
<PropertyGroup>
<LatestTemplateMsiInstallerFile>@(LatestTemplateInstallerComponent->'%(MSIInstallerFile)')</LatestTemplateMsiInstallerFile>
Expand Down
2 changes: 1 addition & 1 deletion src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public DotNetFormatTests(ITestOutputHelper outputHelper) : base(outputHelper) {
/// <Summary>
/// Format an unformatted project and verify that the output matches the pre-computed solution.
/// </Summary>
[Fact]
[Fact(Skip="https://github.com/dotnet/sdk/issues/42920")]
public void FormatProject()
{
if (DotNetHelper.IsMonoRuntime)
Expand Down
2 changes: 1 addition & 1 deletion src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/SdkContentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ static async Task<string> DownloadMsftSdkArchive()
string downloadCacheDir = Path.Combine(Config.DownloadCacheDirectory, "Sdks");
Directory.CreateDirectory(downloadCacheDir);
var client = new HttpClient(new HttpClientHandler() { AllowAutoRedirect = false });
var channel = UbSdkVersion[..5] + "xx";
var channel = UbSdkVersion[..6] + "xx";
var akaMsUrl = $"https://aka.ms/dotnet/{channel}/daily/dotnet-sdk-{Config.TargetRid}{GetArchiveExtension(UbSdkArchivePath)}";

var redirectResponse = await client.GetAsync(akaMsUrl);
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ private string BuildLocalApp([CallerMemberName] string testName = "TestName", st
return publishDirectory;
}

[DockerAvailableFact()]
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/42850")]
public async Task EndToEnd_MultiProjectSolution()
{
ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution));
Expand Down
6 changes: 3 additions & 3 deletions test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace Microsoft.DotNet.Watcher.Tests
{
public class ApplyDeltaTests(ITestOutputHelper logger) : DotNetWatchTestBase(logger)
{
[Fact]
[Fact(Skip = "https://github.com/dotnet/sdk/issues/42850")]
public async Task AddSourceFile()
{
Logger.WriteLine("AddSourceFile started");
Expand Down Expand Up @@ -40,7 +40,7 @@ public static void Print()
await App.AssertOutputLineStartsWith("Changed!");
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/sdk/issues/42850")]
public async Task ChangeFileInDependency()
{
var testAsset = TestAssets.CopyTestAsset("WatchAppWithProjectDeps")
Expand All @@ -66,7 +66,7 @@ public static void Print()
}

// Test is timing out on .NET Framework: https://github.com/dotnet/sdk/issues/41669
[CoreMSBuildOnlyFact]
[CoreMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/42850")]
public async Task HandleTypeLoadFailure()
{
var testAsset = TestAssets.CopyTestAsset("WatchAppTypeLoadFailure")
Expand Down
2 changes: 1 addition & 1 deletion test/dotnet-watch.Tests/HotReload/CompilationHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Microsoft.DotNet.Watcher.Tests;

public class CompilationHandlerTests(ITestOutputHelper logger) : DotNetWatchTestBase(logger)
{
[Fact]
[Fact(Skip = "https://github.com/dotnet/sdk/issues/42850")]
public async Task ReferenceOutputAssembly_False()
{
var testAsset = TestAssets.CopyTestAsset("WatchAppMultiProc")
Expand Down
8 changes: 4 additions & 4 deletions test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public enum TriggerEvent
WaitingForChanges,
}

[Theory]
[Theory(Skip="https://github.com/dotnet/sdk/issues/42850")]
[CombinatorialData]
public async Task UpdateAndRudeEdit(TriggerEvent trigger)
{
Expand Down Expand Up @@ -225,8 +225,8 @@ async Task MakeRudeEditChange()
}
}

[Theory]
[CombinatorialData]
[Theory(Skip = "https://github.com/dotnet/sdk/issues/42850")]
[CombinatorialData]
public async Task UpdateAppliedToNewProcesses(bool sharedOutput)
{
var testAsset = TestAssets.CopyTestAsset("WatchAppMultiProc", identifier: sharedOutput.ToString())
Expand Down Expand Up @@ -373,7 +373,7 @@ public enum UpdateLocation
TopFunction,
}

[Theory]
[Theory(Skip="https://github.com/dotnet/sdk/issues/42850")]
[CombinatorialData]
public async Task HostRestart(UpdateLocation updateLocation)
{
Expand Down
Loading