Skip to content

Commit 78ca6ee

Browse files
0GiS00GiS0
committed
Merge branch 'gisela-cloud-azure' of https://github.com/Lemoncode/bootcamp-devops-lemoncode into gisela-cloud-azure
2 parents a208252 + ff77d41 commit 78ca6ee

8 files changed

Lines changed: 504 additions & 22 deletions

File tree

‎01-contenedores/lemoncode-challenge/dotnet-stack/backend/obj/Debug/netcoreapp3.1/apphost.exe‎

155 KB
Binary file not shown.

‎01-contenedores/lemoncode-challenge/dotnet-stack/backend/obj/Debug/netcoreapp3.1/backend.assets.cache‎

3.41 KB
Binary file not shown.

‎01-contenedores/lemoncode-challenge/dotnet-stack/backend/obj/Debug/netcoreapp3.1/backend.csproj.AssemblyReference.cache‎

-1.81 KB
Binary file not shown.

‎01-contenedores/lemoncode-challenge/dotnet-stack/backend/obj/backend.csproj.nuget.dgspec.json‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,32 @@
11
{
22
"format": 1,
33
"restore": {
4-
"/Users/gis/Desktop/Dev/bootcamp-devops-lemoncode/01-contenedores/lemoncode-challenge/dotnet-stack/backend/backend.csproj": {}
4+
"D:\\repos\\bootcamp-devops-lemoncode\\01-contenedores\\lemoncode-challenge\\dotnet-stack\\backend\\backend.csproj": {}
55
},
66
"projects": {
7-
"/Users/gis/Desktop/Dev/bootcamp-devops-lemoncode/01-contenedores/lemoncode-challenge/dotnet-stack/backend/backend.csproj": {
7+
"D:\\repos\\bootcamp-devops-lemoncode\\01-contenedores\\lemoncode-challenge\\dotnet-stack\\backend\\backend.csproj": {
88
"version": "1.0.0",
99
"restore": {
10-
"projectUniqueName": "/Users/gis/Desktop/Dev/bootcamp-devops-lemoncode/01-contenedores/lemoncode-challenge/dotnet-stack/backend/backend.csproj",
10+
"projectUniqueName": "D:\\repos\\bootcamp-devops-lemoncode\\01-contenedores\\lemoncode-challenge\\dotnet-stack\\backend\\backend.csproj",
1111
"projectName": "backend",
12-
"projectPath": "/Users/gis/Desktop/Dev/bootcamp-devops-lemoncode/01-contenedores/lemoncode-challenge/dotnet-stack/backend/backend.csproj",
13-
"packagesPath": "/Users/gis/.nuget/packages/",
14-
"outputPath": "/Users/gis/Desktop/Dev/bootcamp-devops-lemoncode/01-contenedores/lemoncode-challenge/dotnet-stack/backend/obj/",
12+
"projectPath": "D:\\repos\\bootcamp-devops-lemoncode\\01-contenedores\\lemoncode-challenge\\dotnet-stack\\backend\\backend.csproj",
13+
"packagesPath": "C:\\Users\\giselat\\.nuget\\packages\\",
14+
"outputPath": "D:\\repos\\bootcamp-devops-lemoncode\\01-contenedores\\lemoncode-challenge\\dotnet-stack\\backend\\obj\\",
1515
"projectStyle": "PackageReference",
16+
"fallbackFolders": [
17+
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
18+
],
1619
"configFilePaths": [
17-
"/Users/gis/.nuget/NuGet/NuGet.Config"
20+
"C:\\Users\\giselat\\AppData\\Roaming\\NuGet\\NuGet.Config",
21+
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
22+
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
1823
],
1924
"originalTargetFrameworks": [
2025
"netcoreapp3.1"
2126
],
2227
"sources": {
28+
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
29+
"C:\\Program Files\\dotnet\\library-packs": {},
2330
"https://api.nuget.org/v3/index.json": {}
2431
},
2532
"frameworks": {
@@ -54,6 +61,27 @@
5461
],
5562
"assetTargetFallback": true,
5663
"warn": true,
64+
<<<<<<< HEAD
65+
=======
66+
"downloadDependencies": [
67+
{
68+
"name": "Microsoft.AspNetCore.App.Ref",
69+
"version": "[3.1.10, 3.1.10]"
70+
},
71+
{
72+
"name": "Microsoft.NETCore.App.Host.win-x64",
73+
"version": "[3.1.32, 3.1.32]"
74+
},
75+
{
76+
"name": "Microsoft.NETCore.App.Ref",
77+
"version": "[3.1.0, 3.1.0]"
78+
},
79+
{
80+
"name": "Microsoft.WindowsDesktop.App.Ref",
81+
"version": "[3.1.0, 3.1.0]"
82+
}
83+
],
84+
>>>>>>> ff77d4144f4e412a8c236cf695da2af6b53cac04
5785
"frameworkReferences": {
5886
"Microsoft.AspNetCore.App": {
5987
"privateAssets": "none"
@@ -62,7 +90,7 @@
6290
"privateAssets": "all"
6391
}
6492
},
65-
"runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/8.0.100/RuntimeIdentifierGraph.json"
93+
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.100\\RuntimeIdentifierGraph.json"
6694
}
6795
}
6896
}

‎01-contenedores/lemoncode-challenge/dotnet-stack/backend/obj/backend.csproj.nuget.g.props‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
55
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
66
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
7-
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/gis/.nuget/packages/</NuGetPackageRoot>
8-
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/gis/.nuget/packages/</NuGetPackageFolders>
7+
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
8+
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\giselat\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
99
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
1010
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.8.0</NuGetToolVersion>
1111
</PropertyGroup>
1212
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
13-
<SourceRoot Include="/Users/gis/.nuget/packages/" />
13+
<SourceRoot Include="C:\Users\giselat\.nuget\packages\" />
14+
<SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
1415
</ItemGroup>
1516
</Project>

‎01-contenedores/lemoncode-challenge/dotnet-stack/backend/obj/project.assets.json‎

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4903,24 +4903,32 @@
49034903
]
49044904
},
49054905
"packageFolders": {
4906-
"/Users/gis/.nuget/packages/": {}
4906+
"C:\\Users\\giselat\\.nuget\\packages\\": {},
4907+
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
49074908
},
49084909
"project": {
49094910
"version": "1.0.0",
49104911
"restore": {
4911-
"projectUniqueName": "/Users/gis/Desktop/Dev/bootcamp-devops-lemoncode/01-contenedores/lemoncode-challenge/dotnet-stack/backend/backend.csproj",
4912+
"projectUniqueName": "D:\\repos\\bootcamp-devops-lemoncode\\01-contenedores\\lemoncode-challenge\\dotnet-stack\\backend\\backend.csproj",
49124913
"projectName": "backend",
4913-
"projectPath": "/Users/gis/Desktop/Dev/bootcamp-devops-lemoncode/01-contenedores/lemoncode-challenge/dotnet-stack/backend/backend.csproj",
4914-
"packagesPath": "/Users/gis/.nuget/packages/",
4915-
"outputPath": "/Users/gis/Desktop/Dev/bootcamp-devops-lemoncode/01-contenedores/lemoncode-challenge/dotnet-stack/backend/obj/",
4914+
"projectPath": "D:\\repos\\bootcamp-devops-lemoncode\\01-contenedores\\lemoncode-challenge\\dotnet-stack\\backend\\backend.csproj",
4915+
"packagesPath": "C:\\Users\\giselat\\.nuget\\packages\\",
4916+
"outputPath": "D:\\repos\\bootcamp-devops-lemoncode\\01-contenedores\\lemoncode-challenge\\dotnet-stack\\backend\\obj\\",
49164917
"projectStyle": "PackageReference",
4918+
"fallbackFolders": [
4919+
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
4920+
],
49174921
"configFilePaths": [
4918-
"/Users/gis/.nuget/NuGet/NuGet.Config"
4922+
"C:\\Users\\giselat\\AppData\\Roaming\\NuGet\\NuGet.Config",
4923+
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
4924+
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
49194925
],
49204926
"originalTargetFrameworks": [
49214927
"netcoreapp3.1"
49224928
],
49234929
"sources": {
4930+
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
4931+
"C:\\Program Files\\dotnet\\library-packs": {},
49244932
"https://api.nuget.org/v3/index.json": {}
49254933
},
49264934
"frameworks": {
@@ -4955,6 +4963,27 @@
49554963
],
49564964
"assetTargetFallback": true,
49574965
"warn": true,
4966+
<<<<<<< HEAD
4967+
=======
4968+
"downloadDependencies": [
4969+
{
4970+
"name": "Microsoft.AspNetCore.App.Ref",
4971+
"version": "[3.1.10, 3.1.10]"
4972+
},
4973+
{
4974+
"name": "Microsoft.NETCore.App.Host.win-x64",
4975+
"version": "[3.1.32, 3.1.32]"
4976+
},
4977+
{
4978+
"name": "Microsoft.NETCore.App.Ref",
4979+
"version": "[3.1.0, 3.1.0]"
4980+
},
4981+
{
4982+
"name": "Microsoft.WindowsDesktop.App.Ref",
4983+
"version": "[3.1.0, 3.1.0]"
4984+
}
4985+
],
4986+
>>>>>>> ff77d4144f4e412a8c236cf695da2af6b53cac04
49584987
"frameworkReferences": {
49594988
"Microsoft.AspNetCore.App": {
49604989
"privateAssets": "none"
@@ -4963,7 +4992,7 @@
49634992
"privateAssets": "all"
49644993
}
49654994
},
4966-
"runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/8.0.100/RuntimeIdentifierGraph.json"
4995+
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.100\\RuntimeIdentifierGraph.json"
49674996
}
49684997
}
49694998
},

0 commit comments

Comments
 (0)