Skip to content

Commit

Permalink
Merge branch 'main' into classloader-thread-init
Browse files Browse the repository at this point in the history
* main:
  [Xamarin.Android.Build.Tasks] FileWrites&libraryprojectimports.cache (dotnet#7780)
  Bump to dotnet/installer@d25a3bb 8.0.100-preview.2.23105.6 (dotnet#7769)
  • Loading branch information
grendello committed Feb 15, 2023
2 parents 0e5d90a + c9ff96f commit 3437e9d
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 14 deletions.
18 changes: 9 additions & 9 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-alpha.1.23080.11">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.2.23107.13">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>dec120944450abb58bc07a2fcdae2f4383bfd6bf</Sha>
<Sha>f05478ba9a4026e95306d3f8de59c70cfc0e60ce</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.100-1.23067.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>c790896f128957acd2999208f44f09ae1e826c8c</Sha>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.2.23106.6" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>fe4760cf04dee615948848955978e6d7430982a7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.23080.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.2.23106.6" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9529803ae29c2804880c6bd8ca710b8c037cb498</Sha>
<Sha>fe4760cf04dee615948848955978e6d7430982a7</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-alpha.1" Version="8.0.0-alpha.1.23077.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-preview.2" Version="8.0.0-preview.2.23081.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>0fe864fc71191ff4ee18e59ef0af2929ca367a11</Sha>
<Sha>fd5a0d1b19bf0a96f6b4423150921542b0b9a90d</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-alpha.1.23080.11</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.100-1.23067.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.23080.2</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.2.23107.13</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.2.23106.6</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.2.23106.6</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100alpha1Version>8.0.0-alpha.1.23077.4</MicrosoftNETWorkloadEmscriptenCurrentManifest80100alpha1Version>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100alpha1Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version>8.0.0-preview.2.23081.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -857,6 +857,7 @@ public void ResolveLibraryProjectImports ([Values (true, false)] bool useAapt2)

b.BuildLogFile = "build2.log";
Assert.IsTrue (b.Build (proj), "second build should have succeeded.");
FileAssert.Exists (cacheFile);
var actual = ReadCache (cacheFile);
CollectionAssert.AreEqual (actual.Jars.Select (j => j.ItemSpec),
expected.Jars.Select (j => j.ItemSpec));
Expand All @@ -871,6 +872,7 @@ public void ResolveLibraryProjectImports ([Values (true, false)] bool useAapt2)

b.BuildLogFile = "build3.log";
Assert.IsTrue (b.Build (proj), "third build should have succeeded.");
FileAssert.Exists (cacheFile);
actual = ReadCache (cacheFile);
Assert.AreEqual (expected.Jars.Length + 1, actual.Jars.Length,
$"{nameof (expected.Jars)} should have one more item");
Expand All @@ -885,6 +887,7 @@ public void ResolveLibraryProjectImports ([Values (true, false)] bool useAapt2)
// Build with no changes, checking we are skipping targets appropriately
b.BuildLogFile = "build4.log";
Assert.IsTrue (b.Build (proj), "fourth build should have succeeded.");
FileAssert.Exists (cacheFile);
var targets = new List<string> {
"_UpdateAndroidResgen",
"_CompileJava",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ This file is used by all project types, including binding projects.
OutputImportDirectory="$(_AndroidLibrayProjectIntermediatePath)"
/>
<Touch Files="$(_AndroidStampDirectory)_ResolveLibraryProjectImports.stamp" AlwaysCreate="true" />
<ItemGroup>
<FileWrites Include="$(_AndroidLibraryProjectImportsCache)"
Condition="Exists ('$(_AndroidLibraryProjectImportsCache)')"/>
</ItemGroup>
</Target>

<Target Name="_ExtractLibraryProjectImports" DependsOnTargets="_ResolveLibraryProjectImports">
Expand Down

0 comments on commit 3437e9d

Please sign in to comment.