Skip to content

Commit ae54fe0

Browse files
authored
Remove F# Worker AOT parameter. (#47858)
F# doesn't fully support Native AOT yet. Removing this option until it is supported.
1 parent 496a004 commit ae54fe0

19 files changed

+2
-51
lines changed

src/ProjectTemplates/Web.ProjectTemplates/Worker-FSharp.fsproj.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
<TargetFramework>${DefaultNetCoreTargetFramework}</TargetFramework>
55
<UserSecretsId>dotnet-Company.Application1-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId>
66
<InvariantGlobalization>true</InvariantGlobalization>
7-
<!--#if (NativeAot) -->
8-
<PublishAot>true</PublishAot>
9-
<StripSymbols>true</StripSymbols>
10-
<!--#endif -->
117
<NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
128
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.Application1</RootNamespace>
139
</PropertyGroup>

src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/dotnetcli.host.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
"ExcludeLaunchSettings": {
1212
"longName": "exclude-launch-settings",
1313
"shortName": ""
14-
},
15-
"NativeAot": {
16-
"longName": "publish-native-aot",
17-
"shortName": "aot"
1814
}
1915
},
2016
"usageExamples": [

src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/ide.host.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,5 @@
22
"$schema": "http://json.schemastore.org/ide.host",
33
"order": 300,
44
"icon": "ide/Worker.png",
5-
"supportsDocker": true,
6-
"symbolInfo": [
7-
{
8-
"id": "NativeAot",
9-
"isVisible": true
10-
}
11-
]
5+
"supportsDocker": true
126
}

src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.cs.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
"symbols/Framework/description": "Cílová architektura pro projekt",
77
"symbols/Framework/choices/net8.0/description": "Cílový net8.0",
88
"symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
9-
"symbols/NativeAot/displayName": "Enable _native AOT publish",
10-
"symbols/NativeAot/description": "Whether to enable the project for publishing as native AOT.",
119
"postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
1210
"postActions/restore/manualInstructions/default/text": "Spustit dotnet restore"
1311
}

src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.de.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
"symbols/Framework/description": "Das Zielframework für das Projekt.",
77
"symbols/Framework/choices/net8.0/description": "Ziel net8.0",
88
"symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
9-
"symbols/NativeAot/displayName": "Enable _native AOT publish",
10-
"symbols/NativeAot/description": "Whether to enable the project for publishing as native AOT.",
119
"postActions/restore/description": "„NuGet-Pakete“ wiederherstellen, die für dieses Projekt erforderlich sind.",
1210
"postActions/restore/manualInstructions/default/text": "„dotnet restore“ ausführen"
1311
}

src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.en.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
"symbols/Framework/choices/net8.0/description": "Target net8.0",
88
"_symbols/Framework/choices/net8.0/description.comment": "{Locked='net8.0'}",
99
"symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
10-
"symbols/NativeAot/displayName": "Enable _native AOT publish",
11-
"symbols/NativeAot/description": "Whether to enable the project for publishing as native AOT.",
1210
"postActions/restore/description": "Restore NuGet packages required by this project.",
1311
"postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'"
1412
}

src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.es.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
"symbols/Framework/description": "Marco de destino del proyecto.",
77
"symbols/Framework/choices/net8.0/description": "net8.0 de destino",
88
"symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
9-
"symbols/NativeAot/displayName": "Enable _native AOT publish",
10-
"symbols/NativeAot/description": "Whether to enable the project for publishing as native AOT.",
119
"postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
1210
"postActions/restore/manualInstructions/default/text": "Ejecutar \"dotnet restore\""
1311
}

src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.fr.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
"symbols/Framework/description": "Framework cible du projet.",
77
"symbols/Framework/choices/net8.0/description": "Cible net8.0",
88
"symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
9-
"symbols/NativeAot/displayName": "Enable _native AOT publish",
10-
"symbols/NativeAot/description": "Whether to enable the project for publishing as native AOT.",
119
"postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.",
1210
"postActions/restore/manualInstructions/default/text": "Exécuter « dotnet restore »"
1311
}

src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.it.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
"symbols/Framework/description": "Il framework di destinazione per il progetto.",
77
"symbols/Framework/choices/net8.0/description": "Destinazione net8.0",
88
"symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
9-
"symbols/NativeAot/displayName": "Enable _native AOT publish",
10-
"symbols/NativeAot/description": "Whether to enable the project for publishing as native AOT.",
119
"postActions/restore/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.",
1210
"postActions/restore/manualInstructions/default/text": "Esegui 'dotnet restore'"
1311
}

src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ja.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
"symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
77
"symbols/Framework/choices/net8.0/description": "ターゲット net8.0",
88
"symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
9-
"symbols/NativeAot/displayName": "Enable _native AOT publish",
10-
"symbols/NativeAot/description": "Whether to enable the project for publishing as native AOT.",
119
"postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
1210
"postActions/restore/manualInstructions/default/text": "'dotnet restore' を実行する"
1311
}

src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ko.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
"symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
77
"symbols/Framework/choices/net8.0/description": "대상 net8.0",
88
"symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
9-
"symbols/NativeAot/displayName": "Enable _native AOT publish",
10-
"symbols/NativeAot/description": "Whether to enable the project for publishing as native AOT.",
119
"postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
1210
"postActions/restore/manualInstructions/default/text": "'dotnet restore' 실행"
1311
}

src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.pl.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
"symbols/Framework/description": "Platforma docelowa dla tego projektu.",
77
"symbols/Framework/choices/net8.0/description": "Docelowa platforma net8.0",
88
"symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
9-
"symbols/NativeAot/displayName": "Enable _native AOT publish",
10-
"symbols/NativeAot/description": "Whether to enable the project for publishing as native AOT.",
119
"postActions/restore/description": "Przywróć pakiety NuGet wymagane przez ten projekt.",
1210
"postActions/restore/manualInstructions/default/text": "Uruchom polecenie \"dotnet restore\""
1311
}

src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.pt-BR.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
"symbols/Framework/description": "A estrutura de destino do projeto.",
77
"symbols/Framework/choices/net8.0/description": "net8.0 de destino",
88
"symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
9-
"symbols/NativeAot/displayName": "Enable _native AOT publish",
10-
"symbols/NativeAot/description": "Whether to enable the project for publishing as native AOT.",
119
"postActions/restore/description": "Restaure os pacotes NuGet exigidos por este projeto.",
1210
"postActions/restore/manualInstructions/default/text": "Executar 'dotnet restore'"
1311
}

src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ru.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
"symbols/Framework/description": "Целевая платформа для проекта.",
77
"symbols/Framework/choices/net8.0/description": "Целевая net8.0",
88
"symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
9-
"symbols/NativeAot/displayName": "Enable _native AOT publish",
10-
"symbols/NativeAot/description": "Whether to enable the project for publishing as native AOT.",
119
"postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
1210
"postActions/restore/manualInstructions/default/text": "Выполнить команду \"dotnet restore\""
1311
}

src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.tr.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
"symbols/Framework/description": "Projenin hedef çerçevesi.",
77
"symbols/Framework/choices/net8.0/description": "Hedef net8.0",
88
"symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.",
9-
"symbols/NativeAot/displayName": "Enable _native AOT publish",
10-
"symbols/NativeAot/description": "Whether to enable the project for publishing as native AOT.",
119
"postActions/restore/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.",
1210
"postActions/restore/manualInstructions/default/text": "'dotnet restore' çalıştır"
1311
}

src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.zh-Hans.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
"symbols/Framework/description": "项目的目标框架。",
77
"symbols/Framework/choices/net8.0/description": "目标 net8.0",
88
"symbols/skipRestore/description": "如果指定,则在创建时跳过项目的自动还原。",
9-
"symbols/NativeAot/displayName": "Enable _native AOT publish",
10-
"symbols/NativeAot/description": "Whether to enable the project for publishing as native AOT.",
119
"postActions/restore/description": "还原此项目所需的 NuGet 包。",
1210
"postActions/restore/manualInstructions/default/text": "运行 \"dotnet restore\""
1311
}

src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.zh-Hant.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
"symbols/Framework/description": "專案的目標 Framework。",
77
"symbols/Framework/choices/net8.0/description": "目標 net8.0",
88
"symbols/skipRestore/description": "若指定,會在建立時跳過專案的自動還原。",
9-
"symbols/NativeAot/displayName": "Enable _native AOT publish",
10-
"symbols/NativeAot/description": "Whether to enable the project for publishing as native AOT.",
119
"postActions/restore/description": "還原此專案所需的 NuGet 套件。",
1210
"postActions/restore/manualInstructions/default/text": "執行 'dotnet restore'"
1311
}

src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/template.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,6 @@
6767
"datatype": "bool",
6868
"description": "If specified, skips the automatic restore of the project on create.",
6969
"defaultValue": "false"
70-
},
71-
"NativeAot" : {
72-
"type": "parameter",
73-
"datatype": "bool",
74-
"defaultValue": "false",
75-
"displayName": "Enable _native AOT publish",
76-
"description": "Whether to enable the project for publishing as native AOT."
7770
}
7871
},
7972
"primaryOutputs": [

src/ProjectTemplates/test/Templates.Tests/WorkerTemplateTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public async Task WorkerTemplateAsync(string language, string[] args)
4040

4141
[ConditionalTheory(Skip = "Unskip when Helix supports native AOT. https://github.com/dotnet/aspnetcore/pull/47247/")]
4242
[InlineData("C#")]
43-
[InlineData("F#")]
43+
// [InlineData("F#")] F# doesn't fully support NativeAOT - https://github.com/dotnet/fsharp/issues/13398
4444
public async Task WorkerTemplateNativeAotAsync(string language)
4545
{
4646
await WorkerTemplateCoreAsync(language, args: new[] { ArgConstants.PublishNativeAot });

0 commit comments

Comments
 (0)