Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>572aeedcfa16bdb619fafcecf5924e5c6b65b07b</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Tasks" Version="7.0.100-alpha.1.21601.1">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to add a Maestro subscription for this? Can it be a dependency of dotnet/installer, so when we get updates for dotnet/installer this number follows along?

See an example here on how ILLink updates along with dotnet/installer: #6670

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding dependency is possible, but updates will be coming quite frequently - in templating all the packages are produced on any change (even unrelated to package).

Alternative is to add the task via Arcade SDK, I see the repo has already reference to it https://github.com/xamarin/xamarin-android/blob/71e6ecd67b08394482317c94db9ff35dc051ffbc/global.json#L7 and dependency https://github.com/xamarin/xamarin-android/blob/71e6ecd67b08394482317c94db9ff35dc051ffbc/eng/Version.Details.xml#L21-L24

But this version is very old, we need to update it. Also template localization task is only available from arcade SDK 7, if you need to stay on 6 - we might need to backport it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah need to know for us too.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pjcollins should we setup a weekly subscription for dotnet/arcade?

We might also need to configure a few things so the version number is used throughout our build.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I vaguely remember maestro updates failing for arcade in the past. I think we'll need to bring more of the arcade sdk into the eng/ folder to get arcade updates to flow through maestro, but I am not positive. I can try to look at that this week, but for now maybe we can manually bump this version for this PR?

<Uri>https://github.com/dotnet/templating</Uri>
<Sha />
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22103.1">
Expand Down
1 change: 1 addition & 0 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion>6.0.4</MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Match the first three version numbers and append 00 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<Description>Templates for Android platforms.</Description>
<IncludeContentInPack>true</IncludeContentInPack>
<IncludeBuildOutput>false</IncludeBuildOutput>
<LocalizeTemplates>true</LocalizeTemplates>
<ContentTargetFolders>content</ContentTargetFolders>
<OutputPath>..\..\bin\Build$(Configuration)\nuget-unsigned\</OutputPath>
<!-- Remove the `<group targetFramework=".NETStandard2.0" />` entry from the .nuspec. -->
Expand All @@ -22,4 +23,7 @@
<Compile Remove="**\*" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.TemplateEngine.Tasks" Version="$(MicrosoftTemplateEngineTasksVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Activity template",
"description": "An Android Activity class",
"symbols/namespace/description": "namespace for the generated code"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Activity template",
"description": "An Android Activity class",
"symbols/namespace/description": "namespace for the generated code"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Activity template",
"description": "An Android Activity class",
"symbols/namespace/description": "namespace for the generated code"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Activity template",
"description": "An Android Activity class",
"symbols/namespace/description": "namespace for the generated code"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Activity template",
"description": "An Android Activity class",
"symbols/namespace/description": "namespace for the generated code"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Activity template",
"description": "An Android Activity class",
"symbols/namespace/description": "namespace for the generated code"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Activity template",
"description": "An Android Activity class",
"symbols/namespace/description": "namespace for the generated code"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Activity template",
"description": "An Android Activity class",
"symbols/namespace/description": "namespace for the generated code"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Activity template",
"description": "An Android Activity class",
"symbols/namespace/description": "namespace for the generated code"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Activity template",
"description": "An Android Activity class",
"symbols/namespace/description": "namespace for the generated code"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Activity template",
"description": "An Android Activity class",
"symbols/namespace/description": "namespace for the generated code"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Activity template",
"description": "An Android Activity class",
"symbols/namespace/description": "namespace for the generated code"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Activity template",
"description": "An Android Activity class",
"symbols/namespace/description": "namespace for the generated code"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Activity template",
"description": "An Android Activity class",
"symbols/namespace/description": "namespace for the generated code"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Java Library Binding (Preview)",
"description": "A project for creating a .NET 6 Android class library that binds to a native Java library",
"symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Java Library Binding (Preview)",
"description": "A project for creating a .NET 6 Android class library that binds to a native Java library",
"symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Java Library Binding (Preview)",
"description": "A project for creating a .NET 6 Android class library that binds to a native Java library",
"symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Java Library Binding (Preview)",
"description": "A project for creating a .NET 6 Android class library that binds to a native Java library",
"symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Java Library Binding (Preview)",
"description": "A project for creating a .NET 6 Android class library that binds to a native Java library",
"symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Java Library Binding (Preview)",
"description": "A project for creating a .NET 6 Android class library that binds to a native Java library",
"symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Java Library Binding (Preview)",
"description": "A project for creating a .NET 6 Android class library that binds to a native Java library",
"symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Java Library Binding (Preview)",
"description": "A project for creating a .NET 6 Android class library that binds to a native Java library",
"symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Java Library Binding (Preview)",
"description": "A project for creating a .NET 6 Android class library that binds to a native Java library",
"symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Java Library Binding (Preview)",
"description": "A project for creating a .NET 6 Android class library that binds to a native Java library",
"symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Java Library Binding (Preview)",
"description": "A project for creating a .NET 6 Android class library that binds to a native Java library",
"symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Java Library Binding (Preview)",
"description": "A project for creating a .NET 6 Android class library that binds to a native Java library",
"symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Java Library Binding (Preview)",
"description": "A project for creating a .NET 6 Android class library that binds to a native Java library",
"symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"author": "Microsoft",
"name": "Android Java Library Binding (Preview)",
"description": "A project for creating a .NET 6 Android class library that binds to a native Java library",
"symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"author": "Microsoft",
"name": "Android Layout template",
"description": "An Android layout (XML) file"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"author": "Microsoft",
"name": "Android Layout template",
"description": "An Android layout (XML) file"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"author": "Microsoft",
"name": "Android Layout template",
"description": "An Android layout (XML) file"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"author": "Microsoft",
"name": "Android Layout template",
"description": "An Android layout (XML) file"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"author": "Microsoft",
"name": "Android Layout template",
"description": "An Android layout (XML) file"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"author": "Microsoft",
"name": "Android Layout template",
"description": "An Android layout (XML) file"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"author": "Microsoft",
"name": "Android Layout template",
"description": "An Android layout (XML) file"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"author": "Microsoft",
"name": "Android Layout template",
"description": "An Android layout (XML) file"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"author": "Microsoft",
"name": "Android Layout template",
"description": "An Android layout (XML) file"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"author": "Microsoft",
"name": "Android Layout template",
"description": "An Android layout (XML) file"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"author": "Microsoft",
"name": "Android Layout template",
"description": "An Android layout (XML) file"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"author": "Microsoft",
"name": "Android Layout template",
"description": "An Android layout (XML) file"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"author": "Microsoft",
"name": "Android Layout template",
"description": "An Android layout (XML) file"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"author": "Microsoft",
"name": "Android Layout template",
"description": "An Android layout (XML) file"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"author": "Microsoft",
"name": "Android Application (Preview)",
"description": "A project for creating a .NET 6 Android application",
"symbols/packageName/description": "Overrides the package name in the AndroidManifest.xml",
"symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"author": "Microsoft",
"name": "Android Application (Preview)",
"description": "A project for creating a .NET 6 Android application",
"symbols/packageName/description": "Overrides the package name in the AndroidManifest.xml",
"symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"author": "Microsoft",
"name": "Android Application (Preview)",
"description": "A project for creating a .NET 6 Android application",
"symbols/packageName/description": "Overrides the package name in the AndroidManifest.xml",
"symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"author": "Microsoft",
"name": "Android Application (Preview)",
"description": "A project for creating a .NET 6 Android application",
"symbols/packageName/description": "Overrides the package name in the AndroidManifest.xml",
"symbols/supportedOSVersion/description": "Overrides $(SupportedOSPlatformVersion) in the project"
}
Loading