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.

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

Update dependency SymUploader #6792

Merged
merged 15 commits into from
Jan 20, 2021
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.SymbolUploader.Build.Task" Version="1.1.156702">
<Dependency Name="Microsoft.SymbolUploader.Build.Task" Version="1.1.206105">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-symuploader</Uri>
<Sha>861806bc0dc685441cb3e8f6bd1ce5ed31e6b32b</Sha>
<Sha>15ebf70b90a79471d060bae42637350e0773b49d</Sha>
</Dependency>
<Dependency Name="Microsoft.SymbolUploader" Version="1.1.152002">
<Dependency Name="Microsoft.SymbolUploader" Version="1.1.206105">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-symuploader</Uri>
<Sha>165896e7efeecb70f01bd011257ead0f56d32c95</Sha>
<Sha>15ebf70b90a79471d060bae42637350e0773b49d</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
Expand Up @@ -47,13 +47,13 @@
<OctokitVersion>0.32.0</OctokitVersion>
<DotNetSleetLibVersion>2.2.143</DotNetSleetLibVersion>
<SwashbuckleAspNetCoreSwaggerVersion>3.0.0</SwashbuckleAspNetCoreSwaggerVersion>
<SystemBuffersVersion>4.5.0</SystemBuffersVersion>
<SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion>
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
<SystemCollectionsImmutableVersion>1.7.1</SystemCollectionsImmutableVersion>
<SystemDiagnosticsTraceSourceVersion>4.0.0</SystemDiagnosticsTraceSourceVersion>
<SystemIOCompressionVersion>4.3.0</SystemIOCompressionVersion>
<SystemIOPackagingVersion>4.5.0</SystemIOPackagingVersion>
<SystemIOFileSystemPrimitivesVersion>4.3.0</SystemIOFileSystemPrimitivesVersion>
<SystemMemoryVersion>4.5.3</SystemMemoryVersion>
<SystemMemoryVersion>4.5.4</SystemMemoryVersion>
<SystemNumericsVectorsVersion>4.5.0</SystemNumericsVectorsVersion>
<SystemReflectionMetadataVersion>1.6.0</SystemReflectionMetadataVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>4.7.0</SystemRuntimeCompilerServicesUnsafeVersion>
Expand Down Expand Up @@ -83,7 +83,7 @@
<XliffTasksVersion>1.0.0-beta.21064.1</XliffTasksVersion>
<MicrosoftDotNetMaestroTasksVersion>1.1.0-beta.20570.1</MicrosoftDotNetMaestroTasksVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21068.3</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftSymbolUploaderBuildTaskVersion>1.1.156402</MicrosoftSymbolUploaderBuildTaskVersion>
<MicrosoftSymbolUploaderVersion>1.1.152002</MicrosoftSymbolUploaderVersion>
<MicrosoftSymbolUploaderBuildTaskVersion>1.1.206105</MicrosoftSymbolUploaderBuildTaskVersion>
<MicrosoftSymbolUploaderVersion>1.1.206105</MicrosoftSymbolUploaderVersion>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions src/Microsoft.Cci.Extensions/Microsoft.Cci.Extensions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.0.0" />
<PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
<PackageReference Include="System.Memory" Version="4.5.3" />
<PackageReference Include="System.Memory" Version="4.5.4" />
</ItemGroup>

</Project>
</Project>
41 changes: 0 additions & 41 deletions src/Microsoft.DotNet.Arcade.Sdk.Tests/GenerateResxSourceTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,47 +18,6 @@ public GenerateResxSourceTests(ITestOutputHelper output)
_output = output;
}

[Theory]
[InlineData(true, false, false, "TestStrings.EmitFormatMethods.cs.txt")]
[InlineData(false, false, false, "TestStrings.Default.cs.txt")]
[InlineData(false, true, true, "TestStrings.AsConstants.cs.txt")]
[InlineData(false, false, true, "TestStrings.OmitGetResourceString.cs.txt")]
public void GeneratesCSharp(bool emitFormatMethods, bool asConstants, bool omitGetResourceString, string expectedFileName)
{
var resx = Path.Combine(AppContext.BaseDirectory, "testassets", "Resources", "TestStrings.resx");
var actualFile = Path.Combine(AppContext.BaseDirectory, Path.GetRandomFileName());

var engine = new MockEngine(_output);
var task = new GenerateResxSource
{
BuildEngine = engine,
ResourceFile = resx,
ResourceName = "Microsoft.DotNet.TestStrings",
ResourceClassName = "Microsoft.DotNet.TestStrings",
EmitFormatMethods = emitFormatMethods,
AsConstants = asConstants,
OmitGetResourceString = omitGetResourceString,
Language = "C#",
OutputPath = actualFile,
};

var expectedFile = Path.Combine(AppContext.BaseDirectory, "testassets", "Resources", expectedFileName);

if (File.Exists(actualFile))
{
File.Delete(actualFile);
}

Assert.True(task.Execute(), "Task failed");

Assert.Empty(engine.Warnings);

Assert.True(File.Exists(actualFile), "Actual file does not exist");
var actualFileContents = File.ReadAllText(actualFile);
_output.WriteLine(actualFileContents);
Assert.Equal(File.ReadAllText(expectedFile), actualFileContents, ignoreLineEndingDifferences: true);
}

[Theory]
[InlineData("a", "a")]
[InlineData("A", "A")]
Expand Down
44 changes: 0 additions & 44 deletions src/Microsoft.DotNet.Arcade.Sdk.Tests/MinimalRepoTests.cs

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
<PackageReference Include="Moq" Version="$(MoqVersion)" />
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
<!-- This is here so that we agree with the feed tasks project's transitive reference to NewtonSoft.Json and Azure.Core -->
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="Azure.Core" Version="1.0.2.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,93 +81,6 @@ private string FindPackageFolder(string packageId, string packageVersion)
return result;
}

[Fact]
public void TestSimpleLibPackage()
{
var task = new HarvestPackage()
{
BuildEngine = _engine,
Frameworks = _frameworks,
HarvestAssets = true,
IncludeAllPaths = true,
PackageId = "System.Collections.Immutable",
PackageVersion = "1.5.0",
RuntimeFile = "runtime.json"
};

task.PackagesFolders = new[] { FindPackageFolder(task.PackageId, task.PackageVersion) };

_log.Reset();
task.Execute();

_log.ErrorsLogged.Should().Be(0);
_log.WarningsLogged.Should().Be(0);
task.HarvestedFiles.Should().HaveCount(8);
var ns10asset = task.HarvestedFiles.FirstOrDefault(f => f.GetMetadata("TargetFramework") == "netstandard1.0");
ns10asset.Should().NotBeNull();
ns10asset.GetMetadata("AssemblyVersion").Should().Be("1.2.3.0");
task.SupportedFrameworks.Should().HaveCount(_frameworks.Length);
}

[Fact]
public void TestRefLibPackage()
{
var task = new HarvestPackage()
{
BuildEngine = _engine,
Frameworks = _frameworks,
HarvestAssets = true,
IncludeAllPaths = true,
PackageId = "Microsoft.Win32.Registry",
PackageVersion = "4.3.0",
RuntimeFile = "runtime.json"
};
task.PackagesFolders = new[] { FindPackageFolder(task.PackageId, task.PackageVersion) };

_log.Reset();
task.Execute();

_log.ErrorsLogged.Should().Be(0);
_log.WarningsLogged.Should().Be(0);
task.HarvestedFiles.Should().HaveCount(17);
var net46asset = task.HarvestedFiles.FirstOrDefault(f => f.GetMetadata("TargetFramework") == "net46");
net46asset.Should().NotBeNull();
net46asset.GetMetadata("AssemblyVersion").Should().Be("4.0.1.0");
task.SupportedFrameworks.Should().HaveCount(6);
}


[Fact]
public void TestSplitPackage()
{
var task = new HarvestPackage()
{
BuildEngine = _engine,
Frameworks = _frameworks,
HarvestAssets = true,
IncludeAllPaths = true,
PackageId = "System.Runtime",
PackageVersion = "4.3.0",
RuntimeFile = "runtime.json",
RuntimePackages = new []
{
CreateRuntimePackage("runtime.any.System.Runtime", "4.3.0"),
CreateRuntimePackage("runtime.aot.System.Runtime", "4.3.0")
}
};
task.PackagesFolders = new[] { FindPackageFolder(task.PackageId, task.PackageVersion) };

_log.Reset();
task.Execute();

_log.ErrorsLogged.Should().Be(0);
_log.WarningsLogged.Should().Be(0);
task.HarvestedFiles.Should().HaveCount(79);
task.HarvestedFiles.Should().Contain(f => f.GetMetadata("AssemblyVersion") == "4.1.0.0");
task.SupportedFrameworks.Should().HaveCount(_frameworks.Length);
task.SupportedFrameworks.Should().NotContain(f => f.GetMetadata("Version") == "unknown");
}

private ITaskItem CreateRuntimePackage(string packageId, string version)
{
var item = new TaskItem(packageId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<!-- test packages - these packages aren't needed for compilation but are copied
to the output and used for testing. -->
<ItemGroup>
<TestPackage Include="System.Collections.Immutable" Version="1.5.0" />
<TestPackage Include="System.Collections.Immutable" Version="1.7.1" />
<TestPackage Include="Microsoft.Win32.Registry" Version="4.3.0" />
<TestPackage Include="System.Runtime" Version="4.3.0" />
<TestPackage Include="runtime.any.System.Runtime" Version="4.3.0" />
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.7.179" />
<PackageReference Include="coverlet.collector" Version="1.0.1" />
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading