Skip to content
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

Jump to bottom

Fix places still pointing to xamarin/xamarin-android #9050

Merged
merged 1 commit into from
Jun 25, 2024
Merged

Fix places still pointing to xamarin/xamarin-android #9050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion build-tools/create-packs/License.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Authors>Microsoft</Authors>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<PackageProjectUrl>https://github.com/xamarin/xamarin-android</PackageProjectUrl>
<PackageProjectUrl>https://github.com/dotnet/android</PackageProjectUrl>
<NuGetLicense Condition="Exists('$(XamarinAndroidSourcePath)external\monodroid\tools\scripts\License.txt')">$(XamarinAndroidSourcePath)external\monodroid\tools\scripts\License.txt</NuGetLicense>
<NuGetLicense Condition=" '$(NuGetLicense)' == '' or '$(PackageId)' != 'Microsoft.Android.Sdk.$(HostOS)' ">$(XamarinAndroidSourcePath)LICENSE.TXT</NuGetLicense>
<PackageLicenseFile>LICENSE.TXT</PackageLicenseFile>
Expand Down
4 changes: 2 additions & 2 deletions build-tools/debian-metadata/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Maintainer: Xamarin <hello@xamarin.com>
Build-Depends: debhelper (>=9), cli-common-dev (>= 0.9~)
Standards-Version: 3.9.6
Homepage: https://www.xamarin.com/platform
Vcs-Git: https://github.com/xamarin/xamarin-android.git
Vcs-Browser: https://github.com/xamarin/xamarin-android
Vcs-Git: https://github.com/dotnet/android.git
Vcs-Browser: https://github.com/dotnet/android

Package: xamarin.android-oss
Architecture: amd64
Expand Down
2 changes: 1 addition & 1 deletion build-tools/scripts/XAVersionInfo.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<Output TaskParameter="Branch" PropertyName="XAVersionBranch" Condition=" '$(XAVersionBranch)' == '' " />
</GitBranch>
<PropertyGroup>
<XARepositoryName Condition=" '$(XARepositoryName)' == '' ">xamarin-android</XARepositoryName>
<XARepositoryName Condition=" '$(XARepositoryName)' == '' ">dotnet/android</XARepositoryName>
<!-- See Azure Pipelines predefined variables. -->
<_AndroidPackLabel Condition=" '$(SYSTEM_PULLREQUEST_PULLREQUESTNUMBER)' != '' ">ci.pr.gh$(SYSTEM_PULLREQUEST_PULLREQUESTNUMBER).$(PackVersionCommitCount)</_AndroidPackLabel>
<_AndroidPackBranch>$([System.Text.RegularExpressions.Regex]::Replace('$(XAVersionBranch)', '[^a-zA-Z0-9-]', '-'))</_AndroidPackBranch>
Expand Down
2 changes: 1 addition & 1 deletion build-tools/xaprepare/xaprepare/Application/GeneratedSourceLinkJsonFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public override void Generate (Context context)

json.AppendLine ($" \"{localPath}/*\": \"{contentUri.Uri}/*\",");
}
json.AppendLine ($" \"{BuildPaths.XamarinAndroidSourceRoot}/*\": \"https://raw.githubusercontent.com/xamarin/xamarin-android/{xaCommit}/*\"");
json.AppendLine ($" \"{BuildPaths.XamarinAndroidSourceRoot}/*\": \"https://raw.githubusercontent.com/dotnet/android/{xaCommit}/*\"");
json.AppendLine (" }");
json.AppendLine ("}");

Expand Down
6 changes: 3 additions & 3 deletions tools/relnote-gen/App.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ enum State {

static class App {

const string XamarinAndroidCommitBase = "http://github.com/xamarin/xamarin-android/commit/";
const string XamarinAndroidPullBase = "http://github.com/xamarin/xamarin-android/pull/";
const string XamarinAndroidIssuesBase = "http://github.com/xamarin/xamarin-android/issues/";
const string XamarinAndroidCommitBase = "https://github.com/dotnet/android/commit/";
const string XamarinAndroidPullBase = "https://github.com/dotnet/android/pull/";
const string XamarinAndroidIssuesBase = "https://github.com/dotnet/android/issues/";

static readonly Regex SummaryParser = new Regex (
@"^\s*(\[(?<component>[^]]+)\]\s+)?" +
Expand Down
4 changes: 2 additions & 2 deletions tools/relnote-gen/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ Then the output of `renote-gen` will be:

- Summary
([#NUMBER](URL/NUMBER),
[PR #PR](http://github.com/xamarin/xamarin-android/pull/PR),
[Commit COMMIT](http://github.com/xamarin/xamarin-android/commit/COMMIT))
[PR #PR](https://github.com/dotnet/android/pull/PR),
[Commit COMMIT](https://github.com/dotnet/android/commit/COMMIT))
```

# API Diffs?
Expand Down
Loading